bump gradle plugin version

mapbox · Dec 13, 2021 · ade2dfc · ade2dfc
1 parent e182041
commit ade2dfc
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 102 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,9 +12,9 @@ parameters:
 #---------- EXECUTORS ----------
 #-------------------------------
 executors:
-  ndk-r21e-latest-executor:
+  ndk-r22-latest-executor:
     docker:
-      - image: mbgl/android-ndk-r21e:latest
+      - image: mbgl/android-ndk-r22:latest
     working_directory: ~/code
     environment:
       MBX_CI_DOMAIN: o619qyc20d.execute-api.us-east-1.amazonaws.com
@@ -439,7 +439,7 @@ commands:
 #--------------------------
 jobs:
   prepare-and-assemble:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - checkout
       - when:
@@ -468,7 +468,7 @@ jobs:
             - write-workspace
 
   unit-tests-core:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - when:
           condition:
@@ -482,7 +482,7 @@ jobs:
       - run: exit 0
 
   unit-tests-ui:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - when:
           condition:
@@ -498,7 +498,7 @@ jobs:
   #      - codecov
 
   static-analysis:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - when:
           condition:
@@ -517,7 +517,7 @@ jobs:
       - run: exit 0
 
   publish-documentation:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - checkout
       - prepare-mbx-ci
@@ -530,7 +530,7 @@ jobs:
             ./scripts/publish_api_docs_android.sh -p $GITHUB_WRITER_TOKEN -t $CIRCLE_TAG
 
   changelog-verification:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - checkout
       - when:
@@ -544,7 +544,7 @@ jobs:
             - verify-changelog
 
   ui-robo-tests:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     environment:
       JVM_OPTS: -Xmx3200m
       BUILDTYPE: Debug
@@ -572,7 +572,7 @@ jobs:
       - run: exit 0
 
   internal-instrumentation-tests:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     environment:
       JVM_OPTS: -Xmx3200m
       BUILDTYPE: Debug
@@ -594,7 +594,7 @@ jobs:
       - run: exit 0
 
   instrumentation-tests:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     environment:
       JVM_OPTS: -Xmx3200m
       BUILDTYPE: Debug
@@ -614,13 +614,13 @@ jobs:
       - run: exit 0
 
   mobile-metrics-benchmarks:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - checkout
       - trigger-mobile-metrics
 
   release-snapshot:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - checkout
       - generate-version-name
@@ -637,7 +637,7 @@ jobs:
       - trigger-mobile-metrics
 
   release:
-    executor: ndk-r21e-latest-executor
+    executor: ndk-r22-latest-executor
     steps:
       - checkout
       - generate-version-name

diff --git a/examples/build.gradle b/examples/build.gradle
@@ -71,11 +71,6 @@ android {
         }
     }
 
-    dexOptions {
-        maxProcessCount 8
-        javaMaxHeapSize "2g"
-        preDexLibraries true
-    }
 
     lintOptions {
         abortOnError false
@@ -92,6 +87,9 @@ task downloadUnstrippedNativeLibsDir(type: com.mapbox.gradle.NativeDownloadTask)
             dependenciesList.mapboxNavigator,
             dependenciesList.mapboxCommonNative
     ]
+    sdkRegistryToken = project.hasProperty('SDK_REGISTRY_TOKEN')
+            ? project.property('SDK_REGISTRY_TOKEN')
+            : System.getenv('SDK_REGISTRY_TOKEN')
 }
 
 dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -26,6 +26,11 @@ org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
 
+# Increases stack size for the Kotlin compiler to prevent StackOverflowError
+# when compiling MapboxRouteLineViewTest.kt. Similar issue:
+# https://youtrack.jetbrains.com/issue/KT-46822
+systemProp.kotlin.daemon.jvm.options=-Xss8m
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -4,7 +4,7 @@ ext {
   androidVersions = [
       minSdkVersion           : 21,
       targetSdkVersion        : 30,
-      compileSdkVersion       : 30
+      compileSdkVersion       : 31,
   ]
 
   // Navigation Native CI can run SDK CI downstream with forced Navigation Native version
@@ -40,12 +40,12 @@ ext {
       junit                     : '4.12',
       constraintLayout          : '1.1.3',
       mockito                   : '2.23.4',
-      mockkVersion              : '1.10.0',
+      mockkVersion              : '1.12.1',
       butterknife               : '10.1.0',
-      leakCanaryVersion         : '2.3',
+      leakCanaryVersion         : '2.7',
       espressoVersion           : '3.1.0',
       commonsIO                 : '2.6',
-      robolectric               : '4.3.1',
+      robolectric               : '4.7.3',
       mockwebserver             : '4.9.0',
       gmsLocation               : '17.0.0',
       ktlint                    : '0.41.0',
@@ -164,18 +164,18 @@ ext {
   pluginVersion = [
       checkstyle           : '8.2',
       pmd                  : '5.8.1',
-      gradle               : '4.0.1',
+      gradle               : '7.0.4',
       dependencyGraph      : '0.5.0',
       dependencyUpdates    : '0.29.0',
       kotlin               : kotlinVersion,
       license              : '0.8.5',
       jacoco               : '0.2',
       googleServices       : '4.3.3',
-      mapboxSdkVersions    : '1.1.0',
+      mapboxSdkVersions    : '1.1.3',
       dokka                : '1.4.20',
       mapboxSdkRegistry    : '0.4.0',
       mapboxAccessToken    : '0.2.1',
-      mapboxNativeDownload : '0.1.2',
+      mapboxNativeDownload : '0.2.2',
       firebaseCrashlytics  : '2.5.1'
   ]
 

diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
@@ -7,4 +7,8 @@ jacoco {
 tasks.withType(Test) {
   // needed to capture coverage from Robolectric tests
   jacoco.includeNoLocationClasses = true
+
+  // required to run on Java 9+
+  // refs https://github.com/gradle/gradle/issues/5184#issuecomment-457865951
+  jacoco.excludes = ['jdk.internal.*']
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
diff --git a/...test/java/com/mapbox/navigation/core/routealternatives/RouteAlternativesControllerTest.kt b/...test/java/com/mapbox/navigation/core/routealternatives/RouteAlternativesControllerTest.kt
@@ -403,17 +403,17 @@ class RouteAlternativesControllerTest {
             )
         )
 
-        val routeProgressSlot = slot<RouteProgress>()
-        val alternativesSlot = slot<List<DirectionsRoute>>()
-        val routerOriginSlot = slot<RouterOrigin>()
+        val routeProgressSlots = mutableListOf<RouteProgress>()
+        val alternativesSlots = mutableListOf<List<DirectionsRoute>>()
+        val routerOriginSlots = mutableListOf<RouterOrigin>()
         verify(exactly = 2) {
             observer.onRouteAlternatives(
-                capture(routeProgressSlot),
-                capture(alternativesSlot),
-                capture(routerOriginSlot)
+                capture(routeProgressSlots),
+                capture(alternativesSlots),
+                capture(routerOriginSlots),
             )
         }
-        assertEquals(RouterOrigin.Offboard, routerOriginSlot.captured)
+        assertEquals(RouterOrigin.Offboard, routerOriginSlots.last())
     }
 
     @Test
@@ -453,17 +453,17 @@ class RouteAlternativesControllerTest {
                 )
             )
 
-            val routeProgressSlot = slot<RouteProgress>()
-            val alternativesSlot = slot<List<DirectionsRoute>>()
-            val routerOriginSlot = slot<RouterOrigin>()
+            val routeProgressSlots = mutableListOf<RouteProgress>()
+            val alternativesSlots = mutableListOf<List<DirectionsRoute>>()
+            val routerOriginSlots = mutableListOf<RouterOrigin>()
             verify(exactly = 2) {
                 observer.onRouteAlternatives(
-                    capture(routeProgressSlot),
-                    capture(alternativesSlot),
-                    capture(routerOriginSlot)
+                    capture(routeProgressSlots),
+                    capture(alternativesSlots),
+                    capture(routerOriginSlots),
                 )
             }
-            assertEquals(RouterOrigin.Offboard, routerOriginSlot.captured)
+            assertEquals(RouterOrigin.Offboard, routerOriginSlots.last())
         }
 
     @Test