Skip to content

Commit

Permalink
feat!: support Maps SDK for iOS v9 (#479)
Browse files Browse the repository at this point in the history
* chore: support Maps SDK for iOS v9

* feat!: raise minimum supported OS to iOS 15
  • Loading branch information
wangela authored Jul 31, 2024
1 parent 33f21c1 commit 52c3d4d
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Google-Maps-iOS-Utils.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
s.changelog = "https://github.com/googlemaps/google-maps-ios-utils/blob/main/CHANGELOG.md"
s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
s.authors = "Google Inc."
s.platform = :ios, '14.0'
s.platform = :ios, '15.0'
s.source = { :git => "https://github.com/googlemaps/google-maps-ios-utils.git",
:tag => "v#{s.version.to_s}" }
s.source_files = "Sources/GoogleMapsUtilsObjC/include/*.{h,m}", "Sources/GoogleMapsUtils/**/*.{swift}"
Expand All @@ -25,7 +25,7 @@ Pod::Spec.new do |s|
s.module_name = "GoogleMapsUtils"
s.swift_version = '5.9'

s.dependency 'GoogleMaps', '~> 8.0'
s.dependency 'GoogleMaps', '~> 9.0'
s.static_framework = true

s.test_spec 'Tests' do |unit_tests|
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/googlemaps/ios-maps-sdk",
"state" : {
"revision" : "bd392d7d844b49ec6795871a3c25edd01ab839f2",
"version" : "8.4.0"
"revision" : "0cd72dd45109b0225dd920ff17e0362a96489ec0",
"version" : "9.0.0"
}
},
{
Expand Down
10 changes: 2 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import PackageDescription
let package = Package(
name: "GoogleMapsUtils",
platforms: [
.iOS(.v14),
.iOS(.v15),
],
products: [
.library(
Expand All @@ -29,7 +29,7 @@ let package = Package(
dependencies: [
.package(
url: "https://github.com/googlemaps/ios-maps-sdk",
from: "8.0.0"),
from: "9.0.0"),
.package(
url: "https://github.com/erikdoe/ocmock.git",
revision: "fe1661a3efed11831a6452f4b1a0c5e6ddc08c3d"),
Expand All @@ -39,8 +39,6 @@ let package = Package(
name: "GoogleMapsUtilsObjC",
dependencies: [
.product(name: "GoogleMaps", package: "ios-maps-sdk"),
.product(name: "GoogleMapsBase", package: "ios-maps-sdk"),
.product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
],
publicHeadersPath: "include",
cSettings: [
Expand All @@ -55,8 +53,6 @@ let package = Package(
dependencies: [
.target(name: "GoogleMapsUtilsObjC"),
.product(name: "GoogleMaps", package: "ios-maps-sdk"),
.product(name: "GoogleMapsBase", package: "ios-maps-sdk"),
.product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
]
),
.target(
Expand Down Expand Up @@ -85,8 +81,6 @@ let package = Package(
"GoogleMapsUtilsObjC",
"GoogleMapsUtilsTestsHelper",
.product(name: "GoogleMaps", package: "ios-maps-sdk"),
.product(name: "GoogleMapsBase", package: "ios-maps-sdk"),
.product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
],
path: "Tests/GoogleMapsUtilsSwiftTests",
resources: [.process("Resources")]
Expand Down
4 changes: 2 additions & 2 deletions Podfile.template
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# [START maps_ios_utils_podfile_template]
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '14.0'
platform :ios, '15.0'

target 'YOUR_APPLICATION_TARGET_NAME_HERE' do
use_frameworks!
pod 'GoogleMaps', '8.4.0'
pod 'GoogleMaps', '9.0.0'
pod 'Google-Maps-iOS-Utils', '5.0.0' # x-release-please-version
end
# [END maps_ios_utils_podfile_template]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ range of applications using the [Google Maps SDK for iOS][sdk].
use_frameworks!

target 'TARGET_NAME' do
pod 'GoogleMaps', '8.0.0'
pod 'GoogleMaps', '9.0.0'
pod 'Google-Maps-iOS-Utils', '5.0.0' # x-release-please-start-version
end
```
Expand Down
4 changes: 2 additions & 2 deletions samples/ObjCDemoApp/Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://cdn.cocoapods.org/'
platform :ios, '14.0'
platform :ios, '15.0'

target 'ObjCDemoApp' do
use_frameworks!
pod 'GoogleMaps', '8.4.0'
pod 'GoogleMaps', '9.0.0'
pod 'Google-Maps-iOS-Utils', :path => '../..'
end
4 changes: 2 additions & 2 deletions samples/SwiftDemoApp/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
platform :ios, '14.0'
platform :ios, '15.0'

target 'SwiftDemoApp' do
use_frameworks!
pod 'GoogleMaps', '8.4.0'
pod 'GoogleMaps', '9.0.0'
pod 'Google-Maps-iOS-Utils', :path => '../..', :testspecs => ['Tests']
end

0 comments on commit 52c3d4d

Please sign in to comment.