diff --git a/.fastlane/Fastfile b/.fastlane/Fastfile index e9fb4b3e..b1c8ce1f 100644 --- a/.fastlane/Fastfile +++ b/.fastlane/Fastfile @@ -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 diff --git a/android/build.gradle b/android/build.gradle index 4dadadfd..fc0db72c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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" diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt b/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt index fefbd354..3e0ed117 100644 --- a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt +++ b/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/snapshotter/SnapshotterInstanceManager.kt @@ -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) diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index aa2ea647..13123cfd 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -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 @@ -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 diff --git a/ios/mapbox_maps_flutter.podspec b/ios/mapbox_maps_flutter.podspec index e561d9a3..b8dea7be 100644 --- a/ios/mapbox_maps_flutter.podspec +++ b/ios/mapbox_maps_flutter.podspec @@ -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.