Merge pull request #7 from mapbox/df-dependencies-bump

Kotlin 1.5; Android Gradle Plugin 7.0.4; Kotlin sealed interfaces
mapbox · Jan 14, 2022 · d5f88e7 · d5f88e7
2 parents e5a2928 + ac57adf
commit d5f88e7
Show file tree

Hide file tree

Showing 62 changed files with 215 additions and 754 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -180,9 +180,9 @@ commands:
 #---------- EXECUTORS ----------
 #-------------------------------
 executors:
-  ndk-r21e-executor:
+  default-executor:
     docker:
-      - image: mbgl/android-ndk-r21e:86bcba4d3f
+      - image: mbgl/android-ndk-r22:latest
     working_directory: ~/code
     environment:
       MBX_CI_DOMAIN: o619qyc20d.execute-api.us-east-1.amazonaws.com
@@ -193,7 +193,7 @@ executors:
 #--------------------------
 jobs:
   prepare-and-assemble:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - checkout
       - set-up-aws-for-android
@@ -204,7 +204,7 @@ jobs:
       - write-workspace
 
   static-analysis:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - read-workspace
       - check-license
@@ -213,15 +213,15 @@ jobs:
       - check-public-documentation
 
   pitest-validate:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - read-workspace
       - run:
           name: Validate pitest set up
           command: cd MapboxSearch && bash ../scripts/quick_pitest_check.sh
 
   unit-tests:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - read-workspace
       - codebase-unit-tests
@@ -238,7 +238,7 @@ jobs:
       - write-workspace
 
   instrumentation-tests:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - checkout
       - set-up-aws-for-android
@@ -249,21 +249,21 @@ jobs:
       - run-firebase-sdk-instrumentation
 
   ui-robo-tests:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - read-workspace
       - login-google-cloud-platform
       - run-firebase-sample-robo
 
   ui-instrumentation-tests:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - read-workspace
       - login-google-cloud-platform
       - run-firebase-sample-instrumentation
 
   publish-snapshots:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - checkout
       - set-up-aws-for-android
@@ -273,7 +273,7 @@ jobs:
           command: bash ./scripts/ci-publish-snapshots.sh
 
   publish-release:
-    executor: ndk-r21e-executor
+    executor: default-executor
     steps:
       - checkout
       - set-up-aws-for-android
@@ -324,9 +324,9 @@ workflows:
       - ui-instrumentation-tests:
           requires:
             - prepare-and-assemble
-      - pitest-validate:
-          requires:
-            - unit-tests
+#      - pitest-validate:
+#          requires:
+#            - unit-tests
     triggers:
        - schedule:
            cron: "0 0 * * *"
@@ -352,6 +352,6 @@ workflows:
       - ui-instrumentation-tests:
           requires:
             - prepare-and-assemble
-      - pitest-validate:
-          requires:
-            - unit-tests
+#      - pitest-validate:
+#          requires:
+#            - unit-tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.0.0-beta.25-SNAPSHOT
 
 ### Breaking changes
+- [CORE] Public interfaces `SearchResult`, `ServerSearchResult`, `IndexableRecordSearchResult`, `SearchSuggestion` have been marked as `sealed` as they were not supposed to be implemented by external code.
 - [UI] Now `SearchCategoriesBottomSheetView.CategoryLoadingStateListener.onLoadingError()` callback provides one more parameter - `Exception` occurred during the request.
 - [UI] Now `SearchCategoriesBottomSheetView.CategoryLoadingStateListener.onCategoryResultsLoaded()` callback provides one more parameter - `ResponseInfo` which contains response information.
 
@@ -16,6 +17,7 @@
 - Search Native SDK `0.47.0`
 - Common SDK `21.1.0-rc.1`
 - Telemetry SDK `8.1.1`
+- Kotlin `1.5.31`
 
 
 
@@ -34,6 +36,7 @@
 - Search Native SDK `0.46.1`
 - Common SDK `21.0.1`
 - Telemetry SDK `8.1.0`
+- Kotlin `1.4.21`
 
 
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -90,19 +90,19 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Support Library Annotations.  
-URL: [https://developer.android.com/jetpack/androidx/releases/annotation#1.2.0](https://developer.android.com/jetpack/androidx/releases/annotation#1.2.0)  
+URL: [https://developer.android.com/jetpack/androidx/releases/annotation#1.3.0](https://developer.android.com/jetpack/androidx/releases/annotation#1.3.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Support Library collections.  
-URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html)  
+URL: [https://developer.android.com/jetpack/androidx/releases/collection#1.2.0](https://developer.android.com/jetpack/androidx/releases/collection#1.2.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Support Library compat.  
-URL: [https://developer.android.com/jetpack/androidx/releases/core#1.5.0](https://developer.android.com/jetpack/androidx/releases/core#1.5.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)
 
 ===========================================================================
@@ -186,13 +186,19 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Collections Kotlin Extensions.  
-URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html)  
+URL: [https://developer.android.com/jetpack/androidx/releases/collection#1.2.0](https://developer.android.com/jetpack/androidx/releases/collection#1.2.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
 Mapbox Search Android uses portions of the Core Kotlin Extensions.  
-URL: [https://developer.android.com/jetpack/androidx/releases/core#1.5.0](https://developer.android.com/jetpack/androidx/releases/core#1.5.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)
+
+===========================================================================
+
+Mapbox Search Android uses portions of the Experimental annotation.  
+URL: [https://developer.android.com/jetpack/androidx/releases/annotation#1.1.0](https://developer.android.com/jetpack/androidx/releases/annotation#1.1.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
@@ -338,7 +344,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android AppCompat Library.  
-URL: [https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.0](https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.0)  
+URL: [https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.1](https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.1)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
@@ -361,6 +367,12 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 
 ===========================================================================
 
+Mapbox Search Android uses portions of the Android ConstraintLayout Core.  
+URL: [http://tools.android.com](http://tools.android.com)  
+License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+===========================================================================
+
 Mapbox Search Android uses portions of the Android ConstraintLayout Solver.  
 URL: [http://tools.android.com](http://tools.android.com)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -404,7 +416,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Resources Library.  
-URL: [https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.0](https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.0)  
+URL: [https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.1](https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.1)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
@@ -428,19 +440,19 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Support Library Annotations.  
-URL: [https://developer.android.com/jetpack/androidx/releases/annotation#1.2.0](https://developer.android.com/jetpack/androidx/releases/annotation#1.2.0)  
+URL: [https://developer.android.com/jetpack/androidx/releases/annotation#1.3.0](https://developer.android.com/jetpack/androidx/releases/annotation#1.3.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Support Library collections.  
-URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html)  
+URL: [https://developer.android.com/jetpack/androidx/releases/collection#1.2.0](https://developer.android.com/jetpack/androidx/releases/collection#1.2.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Support Library compat.  
-URL: [https://developer.android.com/jetpack/androidx/releases/core#1.5.0](https://developer.android.com/jetpack/androidx/releases/core#1.5.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)
 
 ===========================================================================
@@ -482,7 +494,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Android Support Library fragment.  
-URL: [https://developer.android.com/jetpack/androidx/releases/fragment#1.3.4](https://developer.android.com/jetpack/androidx/releases/fragment#1.3.4)  
+URL: [https://developer.android.com/jetpack/androidx/releases/fragment#1.3.6](https://developer.android.com/jetpack/androidx/releases/fragment#1.3.6)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
@@ -548,7 +560,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Collections Kotlin Extensions.  
-URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html)  
+URL: [https://developer.android.com/jetpack/androidx/releases/collection#1.2.0](https://developer.android.com/jetpack/androidx/releases/collection#1.2.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================
@@ -560,13 +572,13 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens
 ===========================================================================
 
 Mapbox Search Android uses portions of the Core Kotlin Extensions.  
-URL: [https://developer.android.com/jetpack/androidx/releases/core#1.5.0](https://developer.android.com/jetpack/androidx/releases/core#1.5.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)
 
 ===========================================================================
 
 Mapbox Search Android uses portions of the Experimental annotation.  
-URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx)  
+URL: [https://developer.android.com/jetpack/androidx/releases/annotation#1.1.0](https://developer.android.com/jetpack/androidx/releases/annotation#1.1.0)  
 License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 ===========================================================================

diff --git a/MapboxSearch/build.gradle b/MapboxSearch/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
 
         maven {
             url 'https://api.mapbox.com/downloads/v2/releases/maven'
@@ -25,23 +25,23 @@ buildscript {
     configurations.maybeCreate("pitest")
 
     dependencies {
-        classpath "com.mapbox.mapboxsdk:mapbox-android-sdk-versions:1.1.0"
+        classpath "com.mapbox.mapboxsdk:mapbox-android-sdk-versions:1.1.3"
         classpath "com.android.tools.build:gradle:$gradle_plugin"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.6.0.0"
-        pitest "org.pitest:pitest-junit5-plugin:0.10"
-        classpath "pl.droidsonroids.gradle:gradle-pitest-plugin:0.2.5"
-        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:1.0.2"
+        classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.8.2.0'
+        pitest "org.pitest:pitest-junit5-plugin:0.15"
+        classpath "pl.droidsonroids.gradle:gradle-pitest-plugin:0.2.8"
         classpath "com.jaredsburrows:gradle-license-plugin:0.8.90"
-        classpath 'com.mapbox.gradle.plugins:sdk-registry:0.4.0'
-        classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.2.8'
+        classpath 'com.mapbox.gradle.plugins:sdk-registry:0.7.0'
+        classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.3.0'
     }
 }
 
 plugins {
-    id "io.gitlab.arturbosch.detekt" version "1.5.1"
-    id "org.jetbrains.dokka" version "1.4.30"
-    id "org.jetbrains.kotlinx.binary-compatibility-validator" version "0.4.0"
+    id "io.gitlab.arturbosch.detekt" version "1.17.0"
+    id "org.jetbrains.dokka" version "1.5.0"
+    id "org.jetbrains.kotlinx.binary-compatibility-validator" version "0.8.0"
+    id "com.getkeepsafe.dexcount" version "3.0.1"
 }
 
 apiValidation {
@@ -67,7 +67,7 @@ allprojects {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
 
         maven {
             url 'https://api.mapbox.com/downloads/v2/releases/maven'
@@ -79,6 +79,17 @@ allprojects {
                 password = sdkRegistryToken
             }
         }
+
+        maven {
+            url 'https://api.mapbox.com/downloads/v2/snapshots/maven'
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                username = "mapbox"
+                password = sdkRegistryToken
+            }
+        }
     }
 }
 

diff --git a/MapboxSearch/common-tests/build.gradle b/MapboxSearch/common-tests/build.gradle
@@ -11,7 +11,6 @@ if (mapboxApiToken == null) {
 }
 
 android {
-    buildToolsVersion build_tools_version
     compileSdkVersion compile_sdk_version
 
     defaultConfig {
@@ -20,7 +19,6 @@ android {
         minSdkVersion min_sdk_version
         targetSdkVersion target_sdk_version
 
-        versionName project.property('versionName')
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/MapboxSearch/gradle/dexcount.gradle b/MapboxSearch/gradle/dexcount.gradle
@@ -1,5 +1,8 @@
+// TODO unable to resolve class com.getkeepsafe.dexcount.OutputFormat
+// import com.getkeepsafe.dexcount.OutputFormat
+
 apply plugin: 'com.getkeepsafe.dexcount'
 
 dexcount {
-    format = "json"
-}
+    //format = OutputFormat.JSON
+}
diff --git a/MapboxSearch/gradle/jacoco.gradle b/MapboxSearch/gradle/jacoco.gradle
@@ -1,5 +1,11 @@
 apply plugin: 'jacoco'
 
+apply from: "../gradle/versions.gradle"
+
+jacoco {
+    // Workaround for https://youtrack.jetbrains.com/issue/KT-44757
+    toolVersion = "$jacoco_tool_version"
+}
 
 project.afterEvaluate {
     // Grab all build types and product flavors