Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade mapbox v11 to final version #3211

Merged
merged 1 commit into from
Nov 30, 2023
Merged

chore: upgrade mapbox v11 to final version #3211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
}

Expand Down
4 changes: 2 additions & 2 deletions example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -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
Expand Down
11 changes: 2 additions & 9 deletions ios/RNMBX/CustomHttpHeaders.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion src/components/Viewport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
*/
Expand Down