Support compile SDK 30 (#2147)

Co-authored-by: Kiryl Dzehtsiarenka <[email protected]>
fix robolectric/robolectric#7786

Author: jush

CHANGELOG.md

@@ -7,6 +7,12 @@ Mapbox welcomes participation and contributions from everyone.
 * Fix widgets flickering due to race condition if they are animated.
 * Fix widgets not showing on some zoom levels.
 * Fix map being black when using widgets (e.g. when `MapDebugOptions.TILE_BORDERS` option is enabled).
+# 10.yy.zz
+## Features ✨ and improvements 🏁
+* Downgrade minimum required `compileSDK` from 31 to 30.
+
+## Dependencies
+* Update Mapbox gestures library to 0.9.1
 
 # 10.16.2 November 08, 2023
 ## Bug fixes 🐞

LICENSE.md

@@ -138,7 +138,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 Mapbox Maps Android uses portions of the Android Support Library compat.
 
-URL: [https://developer.android.com/jetpack/androidx/releases/core#1.7.0](https://developer.android.com/jetpack/androidx/releases/core#1.7.0)
+URL: [https://developer.android.com/jetpack/androidx/releases/core#1.6.0](https://developer.android.com/jetpack/androidx/releases/core#1.6.0)
 
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -216,17 +216,9 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
-Mapbox Maps Android uses portions of the AndroidX Futures.
-
-URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html)
-
-License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
 Mapbox Maps Android uses portions of the Core Kotlin Extensions.
 
-URL: [https://developer.android.com/jetpack/androidx/releases/core#1.7.0](https://developer.android.com/jetpack/androidx/releases/core#1.7.0)
+URL: [https://developer.android.com/jetpack/androidx/releases/core#1.6.0](https://developer.android.com/jetpack/androidx/releases/core#1.6.0)
 
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
@@ -246,12 +238,6 @@ License: [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
-Mapbox Maps Android uses portions of the Guava ListenableFuture only.
-
-License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-===========================================================================
-
 Mapbox Maps Android uses portions of the IntelliJ IDEA Annotations.
 
 URL: [http://www.jetbrains.org](http://www.jetbrains.org)

app/build.gradle.kts

@@ -12,7 +12,8 @@ apply {
 val buildFromSource: String by project
 
 android {
-  compileSdk = AndroidVersions.ExampleApp.compileSdkVersion
+  compileSdk = (project.findProperty("APP_USE_COMPILE_SDK") as String?)?.toInt() ?: AndroidVersions.ExampleApp.defaultCompileSdkVersion
+  logger.warn("Using compileSDK: $compileSdk")
   signingConfigs {
     create("release") {
       storeFile = rootProject.file("$rootDir/testapp-release.keystore")
@@ -36,7 +37,7 @@ android {
   defaultConfig {
     applicationId = "com.mapbox.maps.testapp"
     minSdk = AndroidVersions.ExampleApp.minSdkVersion
-    targetSdk = AndroidVersions.ExampleApp.targetSdkVersion
+    targetSdk = this@android.compileSdk
     versionCode = if (project.hasProperty("gitVersionCode")) project.property("gitVersionCode") as Int else 1
     versionName = if (project.hasProperty("gitVersionName")) project.property("gitVersionName") as String else "0.1.0"
     multiDexEnabled = true
@@ -117,8 +118,9 @@ dependencies {
   implementation(Dependencies.androidxMultidex)
   implementation(Dependencies.googleMaterialDesign)
   implementation(Dependencies.squareRetrofit)
-  implementation(Dependencies.androidxFragmentTest)
   implementation(Dependencies.squareRetrofitGsonConverter)
+  // AndroidX Fragment Test is `implementation` because it requires exposing an internal activity in Manifest
+  implementation(Dependencies.androidxFragmentTest)
 
   // By default, the Maps SDK uses the Android Location Provider to obtain raw location updates.
   // And with Android 11, the raw location updates might suffer from precision issue.

app/src/main/AndroidManifest.xml

@@ -119,12 +119,12 @@
             android:name=".examples.java.DSLStylingJavaActivity"
             android:description="@string/description_dsl_styling"
             android:exported="true"
-            android:label="@string/activity_dsl_styling"></activity>
+            android:label="@string/activity_dsl_styling" />
         <activity
             android:name=".examples.java.RuntimeStylingJavaActivity"
             android:description="@string/description_dsl_styling"
             android:exported="true"
-            android:label="@string/activity_dsl_styling"></activity>
+            android:label="@string/activity_dsl_styling" />
         <activity
             android:name=".examples.globe.HeatmapLayerGlobeActivity"
             android:description="@string/description_heatmap_layer"
@@ -986,6 +986,7 @@
         </activity>
         <activity
             android:name=".examples.SecondaryDisplayActivity"
+            android:exported="true"
             android:launchMode="singleTask">
             <meta-data
                 android:name="android.allow_multiple_resumed_activities"
@@ -1225,5 +1226,22 @@
         <meta-data
             android:name="com.mapbox.maps.ThreadChecker"
             android:value="true" />
+
+        <!--
+        androidx.test:core:1.3.0 doesn't define "exported" attribute required for Android 12+ so we
+        set it here explicitly
+        -->
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
+            android:exported="false"
+            tools:node="mergeOnlyAttributes" />
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
+            android:exported="false"
+            tools:node="mergeOnlyAttributes" />
+        <activity
+            android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
+            android:exported="false"
+            tools:node="mergeOnlyAttributes" />
     </application>
 </manifest>

build.gradle.kts

@@ -77,10 +77,18 @@ repositories {
 tasks.withType<org.jetbrains.dokka.gradle.DokkaTask>().configureEach {
   outputDirectory.set(buildDir.resolve(this.name))
 }
-tasks.withType<Test> {
-  maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
+
+// hack to fix unit test, see https://github.com/robolectric/robolectric/issues/5131#issuecomment-509631890.
+subprojects {
+  tasks.withType<Test>().configureEach {
+    maxParallelForks = 2
+    setForkEvery(80)
+    setMaxHeapSize("2048m")
+    setMinHeapSize("1024m")
+  }
 }
 
+
 apiValidation {
   /**
    * Packages that are excluded from public API dumps even if they

buildSrc/src/main/kotlin/Project.kt

@@ -1,7 +1,9 @@
+@file:Suppress("ConstPropertyName")
+
 object AndroidVersions {
   const val minSdkVersion = 21
   const val targetSdkVersion = 30
-  const val compileSdkVersion = 31
+  const val compileSdkVersion = 30
   object AndroidAuto {
     const val minSdkVersion = 23
     const val targetSdkVersion = 30
@@ -14,8 +16,7 @@ object AndroidVersions {
   }
   object ExampleApp {
     const val minSdkVersion = 23
-    const val targetSdkVersion = 33
-    const val compileSdkVersion = 33
+    const val defaultCompileSdkVersion = 33
   }
 }
 
@@ -110,19 +111,19 @@ object Versions {
   const val pluginTaskTree = "2.1.0"
   const val mapboxAccessToken="0.4.0"
   const val mapboxSdkRegistry="1.2.2"
-  const val mapboxGestures = "0.8.0"
+  const val mapboxGestures = "0.9.1" // Required to support compile SDK 30
   const val mapboxJavaServices = "5.4.1"
   const val mapboxBase = "0.8.0"
   const val mapboxGlNative = "10.16.2"
   const val mapboxCommon = "23.8.4"
-  const val androidxCore = "1.7.0" // last version compatible with kotlin 1.5.31
-  const val androidxFragmentTesting = "1.5.0"
+  const val androidxCore = "1.6.0" // Latest version that supports compile SDK 30
+  const val androidxFragmentTesting = "1.3.6" // Latest version that supports compile SDK 30
   const val androidxAnnotation = "1.1.0"
   const val androidxAppcompat = "1.3.0"
   const val androidxTest = "1.4.0"
   const val androidxArchCoreTest = "2.1.0"
   const val androidxConstraintLayout = "2.0.0"
-  const val androidxEspresso = "3.4.0"
+  const val androidxEspresso = "3.3.0" // Newer version either require compile SDK >30 or we hit crash "java.lang.NoSuchMethodError: No static method loadSingleServiceOrNull
   const val androidxJUnit = "1.1.3"
   const val androidxUiAutomator = "2.2.0"
   const val androidxRecyclerView = "1.1.0"
@@ -139,7 +140,7 @@ object Versions {
   const val kotlinCoroutines = "1.3.9"
   const val junit = "4.13.2"
   const val mockk = "1.12.3"
-  const val robolectric = "4.8.1"
+  const val robolectric = "4.11.1"
   const val robolectricEgl = "gl1.1-android-2.1_r1"
   const val lint = "30.0.4"
   const val hamcrest = "2.1"

sdk-base/build.gradle.kts

@@ -22,6 +22,7 @@ android {
     buildConfigField("String", "MAPBOX_SDK_VERSION", String.format("\"%s\"", VERSION_NAME))
     buildConfigField("String", "MAPBOX_VERSION_STRING", String.format("\"Mapbox/%s\"", VERSION_NAME))
     buildConfigField("String", "MAPBOX_EVENTS_USER_AGENT", String.format("\"mapbox-maps-android/%s\"", VERSION_NAME))
+    aarMetadata.minCompileSdk = AndroidVersions.compileSdkVersion
   }
 
   flavorDimensions.add("version")