chore: upgrade mapbox v11 to final version (#3211)

rnmapbox · Nov 30, 2023 · 8abeae6 · 8abeae6
1 parent 59a5fff
commit 8abeae6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 
         if (project.hasProperty('RNMBX11') && project.getProperty('RNMBX11').toBoolean()) {
             RNMapboxMapsUseV11 = true
-            RNMapboxMapsVersion = '11.0.0-rc.2'
+            RNMapboxMapsVersion = '11.0.0'
         }
 
         useCustomMapbox = false
@@ -14,7 +14,7 @@ buildscript {
             kotlinVersion = '1.6.21'
         } else if (System.getenv('CI_MAP_IMPL').equals('mapbox11')) {
             RNMapboxMapsUseV11 = true
-            RNMapboxMapsVersion = '11.0.0-rc.2'
+            RNMapboxMapsVersion = '11.0.0'
             RNMapboxMapsImpl = "mapbox"
         }
 

diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -11,7 +11,7 @@ prepare_react_native_project!
 $RNMapboxMapsImpl = 'mapbox'
 if ENV['RNMBX11']
   $RNMapboxMapsUseV11 = true # use 11 version
-  $RNMapboxMapsVersion = '= 11.0.0-rc.2'
+  $RNMapboxMapsVersion = '= 11.0.0'
 end
 
 if ENV['CI_MAP_IMPL']
@@ -22,7 +22,7 @@ if ENV['CI_MAP_IMPL']
   when 'mapbox11'
     $RNMapboxMapsImpl = 'mapbox'
     $RNMapboxMapsUseV11 = true # use 11 version
-    $RNMapboxMapsVersion = '= 11.0.0-rc.2'
+    $RNMapboxMapsVersion = '= 11.0.0'
   else
     fail "Invalid CI_MAP_IMPL value: #{ENV['CI_MAP_IMPL']}"
   end

diff --git a/ios/RNMBX/CustomHttpHeaders.swift b/ios/RNMBX/CustomHttpHeaders.swift
@@ -46,23 +46,16 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return request
   }
 
+  #if !RNMBX_11
   func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
     customHeaders.forEach {(key,value) in
       download.request.headers[key] = value
     }
     return download
   }
+  #endif
 
   func onResponse(for response: HttpResponse) -> HttpResponse {
     return response
   }
-
-  #if RNMBX_11
-  func onUpload(forUpload upload: UploadOptions) -> UploadOptions {
-    customHeaders.forEach {(key,value) in
-      upload.headers[key] = value
-    }
-    return upload
-  }
-  #endif
 }
diff --git a/src/components/Viewport.tsx b/src/components/Viewport.tsx
@@ -41,7 +41,7 @@ type FollowPuckOptions = {
    *  - number: sets the camera bearing to the constant value on every frame
    *
    * On Android, 'heading' and 'coruse' sets the camera bearing to the same as the location puck's bearing. See
-   * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0-rc.1/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
+   * [syncWithLocationPuck](https://docs.mapbox.com/android/maps/api/11.0.0/mapbox-maps-android/com.mapbox.maps.plugin.viewport.data/-follow-puck-viewport-state-bearing/-sync-with-location-puck/)
    *
    * @default 'heading'
    */