Skip to content

Commit 76e072d

Browse files
Renames, name change, dependency and min version updates
1 parent 2df59e1 commit 76e072d

File tree

50 files changed

+35
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+35
-34
lines changed

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '15.0'
2+
platform :ios, '16.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,12 +436,12 @@
436436
inputPaths = (
437437
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
438438
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
439-
"${PODS_CONFIGURATION_BUILD_DIR}/google_maps_flutter_ios_sdk9/google_maps_flutter_ios_sdk9_privacy.bundle",
439+
"${PODS_CONFIGURATION_BUILD_DIR}/google_maps_flutter_ios_sdk10/google_maps_flutter_ios_sdk10_privacy.bundle",
440440
);
441441
name = "[CP] Copy Pods Resources";
442442
outputPaths = (
443443
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
444-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/google_maps_flutter_ios_sdk9_privacy.bundle",
444+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/google_maps_flutter_ios_sdk10_privacy.bundle",
445445
);
446446
runOnlyForDeploymentPostprocessing = 0;
447447
shellPath = /bin/sh;
@@ -611,7 +611,7 @@
611611
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
612612
GCC_WARN_UNUSED_FUNCTION = YES;
613613
GCC_WARN_UNUSED_VARIABLE = YES;
614-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
614+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
615615
MTL_ENABLE_DEBUG_INFO = YES;
616616
ONLY_ACTIVE_ARCH = YES;
617617
SDKROOT = iphoneos;
@@ -662,7 +662,7 @@
662662
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
663663
GCC_WARN_UNUSED_FUNCTION = YES;
664664
GCC_WARN_UNUSED_VARIABLE = YES;
665-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
665+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
666666
MTL_ENABLE_DEBUG_INFO = NO;
667667
SDKROOT = iphoneos;
668668
TARGETED_DEVICE_FAMILY = "1,2";

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ dependencies:
1111
flutter:
1212
sdk: flutter
1313
flutter_plugin_android_lifecycle: ^2.0.1
14-
google_maps_flutter_ios_sdk9:
14+
google_maps_flutter_ios_sdk10:
1515
# When depending on this package from a real application you should use:
16-
# google_maps_flutter_ios_sdk9: ^x.y.z
16+
# google_maps_flutter_ios_sdk10: ^x.y.z
1717
# See https://dart.dev/tools/pub/dependencies#version-constraints
1818
# The example app is bundled with the plugin so we use a path dependency on
1919
# the parent directory to use the current plugin's version.

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk9.podspec renamed to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10.podspec

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
33
#
44
Pod::Spec.new do |s|
5-
s.name = 'google_maps_flutter_ios_sdk9'
5+
s.name = 'google_maps_flutter_ios_sdk10'
66
s.version = '0.0.1'
77
s.summary = 'Google Maps for Flutter'
88
s.description = <<-DESC
@@ -12,17 +12,16 @@ Downloaded by pub (not CocoaPods).
1212
s.homepage = 'https://github.com/flutter/packages'
1313
s.license = { :type => 'BSD', :file => '../LICENSE' }
1414
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
15-
s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios_sdk9' }
16-
s.documentation_url = 'https://pub.dev/packages/google_maps_flutter_ios_sdk9'
17-
s.source_files = 'google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/**/*.{h,m}'
18-
s.public_header_files = 'google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/include/**/*.h'
15+
s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/google_maps_flutter/google_maps_flutter_ios_sdk10' }
16+
s.documentation_url = 'https://pub.dev/packages/google_maps_flutter_ios_sdk10'
17+
s.source_files = 'google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/**/*.{h,m}'
18+
s.public_header_files = 'google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/include/**/*.h'
1919
s.dependency 'Flutter'
20-
s.dependency 'GoogleMaps', '~> 9.0'
21-
# Google-Maps-iOS-Utils 6.0 and 6.1.0 support GoogleMaps 9.x. The next release
22-
# was 6.1.3, which switched to GoogleMaps 10.x without a major version change.
23-
s.dependency 'Google-Maps-iOS-Utils', '>= 6.0', '<= 6.1.0'
20+
s.dependency 'GoogleMaps', '~> 10.0'
21+
# 6.1.3 was the first version to support GoogleMaps 10.x.
22+
s.dependency 'Google-Maps-iOS-Utils', '~> 6.1.3'
2423
s.static_framework = true
25-
s.platform = :ios, '15.0'
24+
s.platform = :ios, '16.0'
2625
# "Google-Maps-iOS-Utils" is static and contains Swift classes.
2726
# Find the Swift runtime when these plugins are built as libraries without `use_frameworks!`
2827
s.swift_version = '5.9'
@@ -33,5 +32,5 @@ Downloaded by pub (not CocoaPods).
3332
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) FGM_USING_COCOAPODS=1',
3433
}
3534
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
36-
s.resource_bundles = {'google_maps_flutter_ios_sdk9_privacy' => ['google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/Resources/PrivacyInfo.xcprivacy']}
35+
s.resource_bundles = {'google_maps_flutter_ios_sdk10_privacy' => ['google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/Resources/PrivacyInfo.xcprivacy']}
3736
end

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk9/Package.swift renamed to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Package.swift

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,23 @@
88
import PackageDescription
99

1010
let package = Package(
11-
name: "google_maps_flutter_ios_sdk9",
11+
name: "google_maps_flutter_ios_sdk10",
1212
platforms: [
13-
.iOS(.v15)
13+
.iOS(.v16)
1414
],
1515
products: [
16-
.library(name: "google-maps-flutter-ios-sdk9", type: .static, targets: ["google_maps_flutter_ios_sdk9"])
16+
.library(name: "google-maps-flutter-ios-sdk10", type: .static, targets: ["google_maps_flutter_ios_sdk10"])
1717
],
1818
dependencies: [
19-
.package(url: "https://github.com/googlemaps/ios-maps-sdk", "9.0.0"..<"10.0.0"),
20-
// 6.1.3+ requires SDK 10.
21-
.package(url: "https://github.com/googlemaps/google-maps-ios-utils", "6.0.0"..<"6.1.3"),
19+
.package(url: "https://github.com/googlemaps/ios-maps-sdk", "10.0.0"..<"11.0.0"),
20+
// 6.1.3 switched from GoogleMaps 9.x to 10.x without a major version
21+
// change, so pin an exact version to avoid breakage if the same thing
22+
// happens with SDK 11 in the future.
23+
.package(url: "https://github.com/googlemaps/google-maps-ios-utils", exact: "6.1.3"),
2224
],
2325
targets: [
2426
.target(
25-
name: "google_maps_flutter_ios_sdk9",
27+
name: "google_maps_flutter_ios_sdk10",
2628
dependencies: [
2729
.product(
2830
name: "GoogleMapsUtils",
@@ -37,7 +39,7 @@ let package = Package(
3739
.process("Resources")
3840
],
3941
cSettings: [
40-
.headerSearchPath("include/google_maps_flutter_ios_sdk9")
42+
.headerSearchPath("include/google_maps_flutter_ios_sdk10")
4143
]
4244
)
4345
]

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMCATransactionWrapper.m renamed to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMCATransactionWrapper.m

File renamed without changes.

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMClusterManagersController.m renamed to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMClusterManagersController.m

File renamed without changes.

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMConversionUtils.m renamed to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMConversionUtils.m

File renamed without changes.

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMGroundOverlayController.m renamed to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMGroundOverlayController.m

File renamed without changes.

packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk9/Sources/google_maps_flutter_ios_sdk9/FGMImageUtils.m renamed to packages/google_maps_flutter/google_maps_flutter_ios_sdk10/ios/google_maps_flutter_ios_sdk10/Sources/google_maps_flutter_ios_sdk10/FGMImageUtils.m

File renamed without changes.

0 commit comments

Comments
 (0)