Skip to content

Commit 5497a1f

Browse files
authored
ktlint: bump 0.47.1 (#6217)
1 parent 14b8460 commit 5497a1f

120 files changed

Lines changed: 935 additions & 356 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ root = true
44
indent_style = space
55
indent_size = 4
66
continuation_indent_size=4
7+
ktlint_disabled_rules=trailing-comma-on-call-site,trailing-comma-on-declaration-site
78

89
ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^
910

@@ -12,5 +13,11 @@ insert_final_newline=true
1213
# should be limit 100 or 120 symbols
1314
max_line_length=100
1415

16+
[**/qa_test_app/**.kt]
17+
ktlint_disabled_rules=package-name,trailing-comma-on-call-site,trailing-comma-on-declaration-site
18+
1519
[**/test/**.kt]
1620
ktlint_ignore_back_ticked_identifier=true
21+
22+
[**/instrumentation_tests/**.kt]
23+
ktlint_disabled_rules=package-name,filename,trailing-comma-on-call-site,trailing-comma-on-declaration-site

examples/src/main/java/com/mapbox/navigation/examples/core/MapboxNavigationActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,8 @@ class MapboxNavigationActivity : AppCompatActivity() {
293293
.accessToken(getMapboxAccessTokenFromResources())
294294
.eventsAppMetadata(
295295
EventsAppMetadata.Builder(
296-
BuildConfig.APPLICATION_ID, BuildConfig.VERSION_NAME
296+
BuildConfig.APPLICATION_ID,
297+
BuildConfig.VERSION_NAME
297298
).build()
298299
)
299300
.build()

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ext {
5151
robolectric : '4.7.3',
5252
mockwebserver : '4.9.0',
5353
gmsLocation : '17.0.0',
54-
ktlint : '0.45.2',
54+
ktlint : '0.47.1',
5555
kotlinStdLib : kotlinVersion,
5656
firebaseCrashlytics : '17.3.1',
5757
multidex : '2.0.1',

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/HistoryRecordingStateChangeObserverTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class HistoryRecordingStateChangeObserverTest :
5757

5858
@get:Rule
5959
val mapboxNavigationRule = MapboxNavigationRule()
60+
6061
@get:Rule
6162
val mockLocationReplayerRule = MockLocationReplayerRule(mockLocationUpdatesRule)
6263
private lateinit var mapboxNavigation: MapboxNavigation

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/core/MapboxHistoryTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,13 @@ class MapboxHistoryTest : BaseTest<EmptyTestActivity>(EmptyTestActivity::class.j
244244
val firstLocation = historyEvents
245245
.find { it is HistoryEventUpdateLocation } as HistoryEventUpdateLocation
246246
assertEquals(
247-
mockRoute.routeWaypoints.first().longitude(), firstLocation.location.longitude,
247+
mockRoute.routeWaypoints.first().longitude(),
248+
firstLocation.location.longitude,
248249
0.00001
249250
)
250251
assertEquals(
251-
mockRoute.routeWaypoints.first().latitude(), firstLocation.location.latitude,
252+
mockRoute.routeWaypoints.first().latitude(),
253+
firstLocation.location.latitude,
252254
0.00001
253255
)
254256

instrumentation-tests/src/androidTest/java/com/mapbox/navigation/instrumentation_tests/utils/http/FailByRequestMockRequestHandler.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class FailByRequestMockRequestHandler(
1818
} else {
1919
result
2020
}
21-
} else null
21+
} else {
22+
null
23+
}
2224
}
2325
}

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/CurrentIndicesFactory.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ object CurrentIndicesFactory {
77
routeGeometryIndex: Int,
88
legGeometryIndex: Int?,
99
): CurrentIndices = CurrentIndices(
10-
legIndex, routeGeometryIndex, legGeometryIndex
10+
legIndex,
11+
routeGeometryIndex,
12+
legGeometryIndex
1113
)
1214
}

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/NativeRouteParserWrapper.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ object NativeRouteParserWrapper : SDKRouteParser {
2121
routerOrigin: RouterOrigin,
2222
): Expected<String, List<RouteInterface>> =
2323
RouteParser.parseDirectionsResponse(
24-
response, request, routerOrigin.mapToNativeRouteOrigin()
24+
response,
25+
request,
26+
routerOrigin.mapToNativeRouteOrigin()
2527
)
2628
}

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/time/TimeFormatter.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,13 @@ object TimeFormatter {
162162
val minutes =
163163
TimeUnit.SECONDS.toMinutes(leftOverSeconds + TimeUnit.MINUTES.toSeconds(1) / 2)
164164

165-
return if (minutes == 60L) Pair(initialHoursValue + 1, 0) else Pair(
166-
initialHoursValue,
167-
minutes
168-
)
165+
return if (minutes == 60L) {
166+
Pair(initialHoursValue + 1, 0)
167+
} else {
168+
Pair(
169+
initialHoursValue,
170+
minutes
171+
)
172+
}
169173
}
170174
}

libnavigation-base/src/main/java/com/mapbox/navigation/base/internal/trip/notification/NotificationTurnIconResources.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,8 +385,9 @@ class NotificationTurnIconResources private constructor(
385385
if (turnIconTurnSlightRight != other.turnIconTurnSlightRight) return false
386386
if (turnIconTurnSharpLeft != other.turnIconTurnSharpLeft) return false
387387
if (turnIconTurnSharpRight != other.turnIconTurnSharpRight) return false
388-
if (turnIconUturn != other.turnIconUturn)
388+
if (turnIconUturn != other.turnIconUturn) {
389389
return false
390+
}
390391

391392
return true
392393
}

0 commit comments

Comments
 (0)