feat(android): upgrade maps dependency (#226)

capacitor-community · Sep 29, 2023 · 546f3ef · 546f3ef
1 parent 0381342
commit 546f3ef
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 30 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,6 @@
 ext {
     junitVersion =  project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.12'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
     androidxJunitVersion =  project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.1'
     androidxEspressoCoreVersion =  project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.2.0'
 }
@@ -45,10 +46,11 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
+    implementation 'com.google.android.gms:play-services-maps:18.1.0'
     implementation 'com.github.bumptech.glide:glide:4.13.0'
     implementation 'com.caverock:androidsvg-aar:1.4'
 }
diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CapacitorGoogleMaps.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CapacitorGoogleMaps.java
@@ -15,8 +15,9 @@
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
-import com.google.android.libraries.maps.model.CameraPosition;
-import com.google.android.libraries.maps.model.Marker;
+import com.google.android.gms.maps.MapsInitializer;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.Marker;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -64,6 +65,8 @@ public void elementFromPointResult(PluginCall call) {
     public void load() {
         super.load();
 
+        MapsInitializer.initialize(getContext(), MapsInitializer.Renderer.LATEST, null);
+
         this.getBridge().getWebView().setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent event) {

diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CustomMapView.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CustomMapView.java
@@ -14,18 +14,18 @@
 import androidx.core.util.Consumer;
 
 import com.getcapacitor.JSObject;
-import com.google.android.libraries.maps.CameraUpdate;
-import com.google.android.libraries.maps.CameraUpdateFactory;
-import com.google.android.libraries.maps.GoogleMap;
-import com.google.android.libraries.maps.GoogleMapOptions;
-import com.google.android.libraries.maps.MapView;
-import com.google.android.libraries.maps.OnMapReadyCallback;
-import com.google.android.libraries.maps.UiSettings;
-import com.google.android.libraries.maps.model.CameraPosition;
-import com.google.android.libraries.maps.model.LatLng;
-import com.google.android.libraries.maps.model.Marker;
-import com.google.android.libraries.maps.model.PointOfInterest;
-import com.google.android.libraries.maps.model.Polygon;
+import com.google.android.gms.maps.CameraUpdate;
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.GoogleMapOptions;
+import com.google.android.gms.maps.MapView;
+import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.UiSettings;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.PointOfInterest;
+import com.google.android.gms.maps.model.Polygon;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CustomMarker.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CustomMarker.java
@@ -6,12 +6,12 @@
 import androidx.fragment.app.FragmentActivity;
 
 import com.getcapacitor.JSObject;
-import com.google.android.libraries.maps.GoogleMap;
-import com.google.android.libraries.maps.model.BitmapDescriptor;
-import com.google.android.libraries.maps.model.BitmapDescriptorFactory;
-import com.google.android.libraries.maps.model.LatLng;
-import com.google.android.libraries.maps.model.Marker;
-import com.google.android.libraries.maps.model.MarkerOptions;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.model.BitmapDescriptor;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
 
 import java.util.UUID;
 

diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CustomPolygon.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/CustomPolygon.java
@@ -7,10 +7,10 @@
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.util.WebColor;
-import com.google.android.libraries.maps.GoogleMap;
-import com.google.android.libraries.maps.model.LatLng;
-import com.google.android.libraries.maps.model.Polygon;
-import com.google.android.libraries.maps.model.PolygonOptions;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Polygon;
+import com.google.android.gms.maps.model.PolygonOptions;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MapCameraPosition.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MapCameraPosition.java
@@ -5,8 +5,8 @@
 import androidx.annotation.Nullable;
 
 import com.getcapacitor.JSObject;
-import com.google.android.libraries.maps.model.CameraPosition;
-import com.google.android.libraries.maps.model.LatLng;
+import com.google.android.gms.maps.model.CameraPosition;
+import com.google.android.gms.maps.model.LatLng;
 
 import org.json.JSONException;
 

diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MapPreferences.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MapPreferences.java
@@ -3,7 +3,7 @@
 import androidx.annotation.Nullable;
 
 import com.getcapacitor.JSObject;
-import com.google.android.libraries.maps.GoogleMapOptions;
+import com.google.android.gms.maps.GoogleMapOptions;
 
 public class MapPreferences {
     public MapPreferencesGestures gestures;

diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MapPreferencesAppearance.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MapPreferencesAppearance.java
@@ -3,7 +3,7 @@
 import androidx.annotation.Nullable;
 
 import com.getcapacitor.JSObject;
-import com.google.android.libraries.maps.model.MapStyleOptions;
+import com.google.android.gms.maps.model.MapStyleOptions;
 
 public class MapPreferencesAppearance {
     public Integer type;

diff --git a/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MarkersAppender.java b/android/src/main/java/com/hemangkumar/capacitorgooglemaps/MarkersAppender.java
@@ -7,7 +7,7 @@
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
-import com.google.android.libraries.maps.model.Marker;
+import com.google.android.gms.maps.model.Marker;
 
 import org.json.JSONException;
 import org.json.JSONObject;