Skip to content

Commit

Permalink
Bump MapboxMaps SDK to v11.4.0-beta.2 (#530)
Browse files Browse the repository at this point in the history
* v11.4.0-beta.2 dependencies bump

* update to latest MapboxStyleManager ctor

* Run iOS integration tests in Debug mode

* Build integration tests in debug

* Revert recent changes

* Disable testatiblity when run iOS tests

---------

Co-authored-by: Aleksei Sapitskii <aleksei.sapitskii@mapbox.com>
  • Loading branch information
maios and aleksproger committed May 3, 2024
1 parent ebd18f6 commit fd2c16c
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .fastlane/Fastfile
Expand Up @@ -31,7 +31,7 @@ platform :ios do
xcconfig: "example/ios/Flutter/Release.xcconfig",
derived_data_path: "example/build/output",
configuration: "Release",
xcargs: "ENABLE_TESTABILITY=YES SWIFT_TREAT_WARNINGS_AS_ERRORS=NO COMPILER_INDEX_STORE_ENABLE=NO",
xcargs: "SWIFT_TREAT_WARNINGS_AS_ERRORS=NO COMPILER_INDEX_STORE_ENABLE=NO",
skip_detect_devices: true, # Required
build_for_testing: true, # Required
sdk: 'iphoneos', # Required
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Expand Up @@ -63,7 +63,7 @@ if (file("$rootDir/gradle/ktlint.gradle").exists() && file("$rootDir/gradle/lint
}

dependencies {
implementation "com.mapbox.maps:android:11.3.0"
implementation "com.mapbox.maps:android:11.4.0-beta.2"

implementation "androidx.annotation:annotation:1.7.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.0"
Expand Down
Expand Up @@ -34,7 +34,11 @@ class SnapshotterInstanceManager(
val styleManager: com.mapbox.maps.StyleManager = snapshotter.styleManager() // TODO: expose this on Android
val eventHandler = MapboxEventHandler(styleManager, proxyBinaryMessenger)
val snapshotterController = SnapshotterController(context, snapshotter, eventHandler)
val mapboxStyleManager = MapboxStyleManager(styleManager, options.pixelRatio.toFloat())
val mapboxStyleManager = MapboxStyleManager(
styleManager,
options.pixelRatio.toFloat(),
mapLoadingErrorDelegate = {}
)
val snapshotterStyleController = StyleController(context, mapboxStyleManager)

_SnapshotterMessenger.setUp(proxyBinaryMessenger, snapshotterController)
Expand Down
22 changes: 11 additions & 11 deletions example/ios/Podfile.lock
Expand Up @@ -4,14 +4,14 @@ PODS:
- Flutter
- mapbox_maps_flutter (1.1.0):
- Flutter
- MapboxMaps (~> 11.3.0)
- MapboxMaps (~> 11.4.0-beta.2)
- Turf (= 2.8.0)
- MapboxCommon (24.3.1)
- MapboxCoreMaps (11.3.0):
- MapboxCommon (~> 24.3)
- MapboxMaps (11.3.0):
- MapboxCommon (= 24.3.1)
- MapboxCoreMaps (= 11.3.0)
- MapboxCommon (24.4.0-beta.2)
- MapboxCoreMaps (11.4.0-beta.2):
- MapboxCommon (~> 24.4.0-beta)
- MapboxMaps (11.4.0-beta.2):
- MapboxCommon (= 24.4.0-beta.2)
- MapboxCoreMaps (= 11.4.0-beta.2)
- Turf (= 2.8.0)
- permission_handler_apple (9.1.1):
- Flutter
Expand Down Expand Up @@ -43,10 +43,10 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
integration_test: 13825b8a9334a850581300559b8839134b124670
mapbox_maps_flutter: fe398def5810ab550d0022cb8be6cdbbfe59cbd0
MapboxCommon: e6d0d15f1e34278e21bae28bdc548d378757b51e
MapboxCoreMaps: 0e3eab0bd5787e833d48261fa1d01f356d6c4ad8
MapboxMaps: 5aba2ba70a85d08e0ea00ad011ca3d2965e69a59
mapbox_maps_flutter: a5b851d1c13a23e6232400375af26b63307223f4
MapboxCommon: 7e0be4c0792c7f037e1a52faada7b9ffec6abdee
MapboxCoreMaps: 5120129b4c1b46eeccf19dd260f77c83e345e081
MapboxMaps: 7111c4812c5a6b4692bd46913db0bcc1b4db8b9f
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e

Expand Down
2 changes: 1 addition & 1 deletion ios/mapbox_maps_flutter.podspec
Expand Up @@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.dependency 'Flutter'
s.platform = :ios, '12.0'

s.dependency 'MapboxMaps', '~> 11.3.0'
s.dependency 'MapboxMaps', '~> 11.4.0-beta.2'
s.dependency 'Turf', '2.8.0'

# Flutter.framework does not contain a i386 slice.
Expand Down

0 comments on commit fd2c16c

Please sign in to comment.