fix(android,v10): fix android v10 build issue - allowOverlapWithPuck (#…

…3247)
rnmapbox · Dec 6, 2023 · c4660ef · c4660ef
1 parent 284fefb
commit c4660ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt b/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Annotation.kt
@@ -21,6 +21,10 @@ fun ViewAnnotationOptions.Builder.height(value: Double): ViewAnnotationOptions.B
   return this.height(value.toInt())
 }
 
+fun com.mapbox.maps.ViewAnnotationOptions.Builder.allowOverlapWithPuck(value: Boolean): ViewAnnotationOptions.Builder {
+  return this;
+}
+
 abstract class OnViewAnnotationUpdatedListener : _OnViewAnnotationUpdatedListener {
   override fun onViewAnnotationPositionUpdated(
     view: View,

diff --git a/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Annotation.kt b/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Annotation.kt
@@ -27,7 +27,6 @@ fun ViewAnnotationOptions.Builder.offsets(x: Double, y: Double) {
   ))
 }
 
-
 abstract class OnViewAnnotationUpdatedListener : _OnViewAnnotationUpdatedListener {
 
 }
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -2,10 +2,6 @@ buildscript {
     ext {
         RNMapboxMapsImpl = "mapbox"
 
-        if (project.hasProperty('RNMBX11') && project.getProperty('RNMBX11').toBoolean()) {
-            RNMapboxMapsVersion = '11.0.0'
-        }
-
         useCustomMapbox = false
 
         if (System.getenv('CI_MAP_IMPL').equals('mapbox')) {
@@ -14,6 +10,8 @@ buildscript {
         } else if (System.getenv('CI_MAP_IMPL').equals('mapbox11')) {
             RNMapboxMapsVersion = '11.0.0'
             RNMapboxMapsImpl = "mapbox"
+        } else if (project.hasProperty('RNMBX11') && project.getProperty('RNMBX11').toBoolean()) {
+            RNMapboxMapsVersion = '11.0.0'
         }
 
         // Mapbox deps