Revert Maps Android SDK initializer (#2266) (#2272)

* Revert Maps Android SDK initializer * changelog * changelog
mapbox · Feb 22, 2024 · ca255af · ca255af
1 parent 8633237
commit ca255af
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 199 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Mapbox welcomes participation and contributions from everyone.
 
 # 10.16.5
 ## Features ✨ and improvements 🏁
+* Introduce better way (compared to v10.16.3) of dealing with `java.lang.UnsatisfiedLinkError` exception happening on the startup.
 
 ## Bug fixes 🐞
 * Address crashes on certain Android devices by disabling the texture pool.

diff --git a/buildSrc/src/main/kotlin/Project.kt b/buildSrc/src/main/kotlin/Project.kt
@@ -52,7 +52,6 @@ object Dependencies {
   const val androidxRecyclerView = "androidx.recyclerview:recyclerview:${Versions.androidxRecyclerView}"
   const val androidxCoreKtx = "androidx.core:core-ktx:${Versions.androidxCore}"
   const val androidxAnnotations = "androidx.annotation:annotation:${Versions.androidxAnnotation}"
-  const val androidxStartup = "androidx.startup:startup-runtime:${Versions.androidxStartup}"
   const val androidxInterpolators = "androidx.interpolator:interpolator:${Versions.androidxInterpolator}"
   const val androidxConstraintLayout = "androidx.constraintlayout:constraintlayout:${Versions.androidxConstraintLayout}"
   const val androidxEspresso = "androidx.test.espresso:espresso-core:${Versions.androidxEspresso}"
@@ -120,7 +119,6 @@ object Versions {
   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 androidxStartup = "1.1.0"
   const val androidxAppcompat = "1.3.0"
   const val androidxTest = "1.4.0"
   const val androidxArchCoreTest = "2.1.0"

diff --git a/sdk-base/api/PublicRelease/metalava.txt b/sdk-base/api/PublicRelease/metalava.txt
@@ -22,21 +22,6 @@ package com.mapbox.maps {
   @kotlin.RequiresOptIn(level=kotlin.RequiresOptIn.Level, message="This API is experimental. It may be changed in the future without notice.") @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget, kotlin.annotation.AnnotationTarget}) public @interface MapboxExperimental {
   }
 
-  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class MapboxInitializer implements androidx.startup.Initializer<java.lang.Boolean> {
-    ctor public MapboxInitializer();
-    method public Boolean create(android.content.Context context);
-    method public java.util.List<java.lang.Class<? extends androidx.startup.Initializer<?>>> dependencies();
-    method @MainThread @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @kotlin.jvm.Throws(exceptionClasses=MapboxInitializerException::class) public static void init(android.content.Context context) throws java.lang.Throwable;
-    field public static final com.mapbox.maps.MapboxInitializer.Companion Companion;
-  }
-
-  public static final class MapboxInitializer.Companion {
-    method @MainThread @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) @kotlin.jvm.Throws(exceptionClasses=MapboxInitializerException::class) public void init(android.content.Context context) throws java.lang.Throwable;
-  }
-
-  public final class MapboxInitializerKt {
-  }
-
   public interface MapboxLifecycleObserver {
     method public void onDestroy();
     method public void onLowMemory();

diff --git a/sdk-base/build.gradle.kts b/sdk-base/build.gradle.kts
@@ -50,7 +50,6 @@ dependencies {
     api(Dependencies.mapboxGlNative)
     api(Dependencies.mapboxCoreCommon)
   }
-  implementation(Dependencies.androidxStartup)
 
   testImplementation(Dependencies.junit)
   testImplementation(Dependencies.mockk)

diff --git a/sdk-base/src/main/AndroidManifest.xml b/sdk-base/src/main/AndroidManifest.xml
@@ -1,25 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mapbox.maps.base">
-
-    <application>
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <!-- Disable Common and Maps SDK Initializers -->
-            <meta-data
-                android:name="com.mapbox.common.MapboxSDKCommonInitializer"
-                tools:node="remove" />
-            <meta-data
-                android:name="com.mapbox.maps.loader.MapboxMapsInitializer"
-                tools:node="remove" />
-
-            <!-- Introduce the new unified initializer -->
-            <meta-data
-                android:name="com.mapbox.maps.MapboxInitializer"
-                android:value="androidx.startup" />
-        </provider>
-    </application>
-</manifest>
+<manifest package="com.mapbox.maps.base"/>
diff --git a/sdk-base/src/main/java/com/mapbox/maps/MapboxInitializer.kt b/sdk-base/src/main/java/com/mapbox/maps/MapboxInitializer.kt
diff --git a/sdk/src/main/java/com/mapbox/maps/MapSurface.kt b/sdk/src/main/java/com/mapbox/maps/MapSurface.kt
@@ -46,7 +46,6 @@ class MapSurface : MapPluginProviderDelegate, MapControllable {
     surface: Surface,
     mapInitOptions: MapInitOptions = MapInitOptions(context) // could use strong ref here as MapInitOptions have strong ref in any case
   ) {
-    MapboxInitializer.init(context)
     this.context = context
     this.surface = surface
     this.mapInitOptions = mapInitOptions

diff --git a/sdk/src/main/java/com/mapbox/maps/MapView.kt b/sdk/src/main/java/com/mapbox/maps/MapView.kt
@@ -92,7 +92,6 @@ open class MapView : FrameLayout, MapPluginProviderDelegate, MapControllable {
     defStyleRes: Int,
     initOptions: MapInitOptions?,
   ) : super(context, attrs, defStyleAttr, defStyleRes) {
-    MapboxInitializer.init(context)
     val resolvedMapInitOptions = if (attrs != null) {
       parseTypedArray(context, attrs)
     } else {

diff --git a/sdk/src/main/java/com/mapbox/maps/Snapshotter.kt b/sdk/src/main/java/com/mapbox/maps/Snapshotter.kt
@@ -46,7 +46,6 @@ open class Snapshotter {
     options: MapSnapshotOptions,
     overlayOptions: SnapshotOverlayOptions = SnapshotOverlayOptions()
   ) {
-    MapboxInitializer.init(context)
     this.context = WeakReference(context)
     mapSnapshotOptions = options
     snapshotOverlayOptions = overlayOptions