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

Jump to bottom

feat!: Bump minimum to iOS 14 #444

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

feat!: Bump minimum to iOS 14 #444

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5eed6b5
feat!: Bump minimum to iOS 14
wangela Jun 3, 2023
a85b646
chore: correct dependency in SwiftDemoApp
wangela Jun 3, 2023
a050186
chore: downgrade GoogleMaps dependency until version bump
wangela Jun 3, 2023
b1f161e
chore: update images used in workflows
wangela Jun 3, 2023
d9b58a0
chore: release and test workflows
wangela Jun 5, 2023
7cda44d
Merge branch 'main' into wangela/8-0-0
wangela Jun 15, 2023
75da9bb
chore: merge from main
wangela Nov 21, 2023
d18c32d
feat!: update to latest version of GoogleMaps
wangela Nov 21, 2023
ac0d208
chore: update minimum OS
wangela Nov 21, 2023
04441e1
chore: update workflows and README
wangela Nov 29, 2023
91a70c5
chore: update podspec dependency to 8.0 as the floor
wangela Nov 29, 2023
59b3987
docs: update SPM install instructions in README
wangela Dec 14, 2023
a3c0c33
fix: remove version from podspec dependency (restore #277)
wangela Dec 21, 2023
6b7b6ef
chore: update GMSMapView initializer with GMSMapViewOptions
wangela Dec 22, 2023
05b8ef4
chore: migrate from deprecated UIGraphicsBeginImageContext
wangela Dec 22, 2023
0720ccd
chore: update obj-c sample app GMSMapView initializer
wangela Dec 22, 2023
bdf509d
chore: update GMSMapView initializer in dev app
wangela Dec 22, 2023
a1dd9bb
chore: update GMSMapView initializer in test app
wangela Dec 22, 2023
b7c7322
chore: update test since migration to imageRenderer returns non-nil i…
wangela Dec 22, 2023
2ec5f0f
chore: migrate from src and test to Sources and Test
wangela Feb 2, 2024
85bb458
chore: update header location
wangela Feb 2, 2024
3a04992
chore: flatten header directory structure
wangela Feb 2, 2024
04f90b1
chore: exclude platforms from Swift package
wangela Feb 3, 2024
05fb820
chore: flatten header files
wangela Feb 3, 2024
ec2033b
chore: move top-level header file
wangela Feb 3, 2024
5b81e60
chore: fix package manifest and headers
wangela Feb 3, 2024
5741dbf
chore: update podspec and xcconfig
wangela Feb 14, 2024
de4e482
chore: try adding resource bundle
wangela Feb 15, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Build DevApp
run: |
xcodebuild -scheme DevApp -configuration Debug -destination "platform=iOS Simulator,OS=16.2,name=iPhone 8" build | xcpretty
xcodebuild -scheme DevApp -configuration Debug -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build | xcpretty

build_swift_sample:
runs-on: macos-latest
Expand All @@ -62,7 +62,7 @@ jobs:
run: |
xcodebuild -workspace samples/SwiftDemoApp/SwiftDemoApp.xcworkspace \
-scheme SwiftDemoApp -configuration Debug \
-destination "platform=iOS Simulator,OS=16.2,name=iPhone 8" build | xcpretty
-destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build | xcpretty

build_objc_sample:
runs-on: macos-latest
Expand All @@ -82,7 +82,7 @@ jobs:
run: |
xcodebuild -workspace samples/ObjCDemoApp/ObjCDemoApp.xcworkspace \
-scheme ObjCDemoApp -configuration Debug \
-destination "platform=iOS Simulator,OS=16.2,name=iPhone 8" build | xcpretty
-destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build | xcpretty

test: # used as required status check
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ on:
workflow_dispatch:
jobs:
release:
runs-on: macos-11
runs-on: macos-12
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
runs-on: macos-12
runs-on: macos-14

you can use macos-14 as it's the M1 macs that are faster on building/testing

steps:
- name: Checkout
uses: actions/checkout@v3
with:
token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}

- name: Use Xcode 13.2.1
run: sudo xcode-select -s /Applications/Xcode_13.2.1.app/Contents/Developer
- name: Use Xcode 14.2
run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer

- name: Install Dependencies
run: |
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,14 @@ jobs:

- name: Install Dependencies
run: |
brew install carthage
sudo gem install cocoapods

- name: Carthage update
run: carthage update --platform iOS --use-xcframeworks

- name: Carthage build
run: carthage build --no-skip-current --use-xcframeworks

- name: CocoaPods spec lint
run: pod lib lint Google-Maps-iOS-Utils.podspec

- name: Run unit tests
run: |
xcodebuild -scheme UnitTest -configuration Debug -destination "platform=iOS Simulator,OS=13.2.1,name=iPhone 8" build test | xcpretty
xcodebuild -scheme UnitTest -configuration Debug -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build test | xcpretty

- name: Upload test results to CodeCov
run: bash <(curl -s https://codecov.io/bash)
12 changes: 6 additions & 6 deletions GoogleMapsUtils.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1572,7 +1572,7 @@
"\"${SRCROOT}/../test\"",
);
INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1603,7 +1603,7 @@
"\"${SRCROOT}/../test\"",
);
INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1666,7 +1666,7 @@
"\"${SRCROOT}/../src\"",
"\"${SRCROOT}/../test\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1701,7 +1701,7 @@
"\"${SRCROOT}/../src\"",
"\"${SRCROOT}/../test\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1752,7 +1752,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = GoogleMapsUtils/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1806,7 +1806,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = GoogleMapsUtils/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
4 changes: 2 additions & 2 deletions Podfile.template
View file
Open in desktop
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, '13.0'
platform :ios, '14.0'

target 'YOUR_APPLICATION_TARGET_NAME_HERE' do
use_frameworks!
pod 'GoogleMaps', '7.4.0'
pod 'GoogleMaps', '8.0.0'
pod 'Google-Maps-iOS-Utils', '4.2.2'
end
# [END maps_ios_utils_podfile_template]
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ range of applications using the [Google Maps SDK for iOS][sdk].

## Requirements

- iOS 13.0+
- iOS 14.0+
- [Maps SDK for iOS][sdk] (see [Releases](https://github.com/googlemaps/google-maps-ios-utils/releases) for minimum compatible version)

## Installation
Expand Down
8 changes: 4 additions & 4 deletions samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -318,7 +318,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -333,7 +333,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = ObjCDemoApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -347,7 +347,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
INFOPLIST_FILE = ObjCDemoApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
4 changes: 2 additions & 2 deletions samples/ObjCDemoApp/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://cdn.cocoapods.org/'
platform :ios, '13.0'
platform :ios, '14.0'

target 'ObjCDemoApp' do
use_frameworks!
pod 'GoogleMaps', '~> 7.3'
pod 'GoogleMaps', '7.4.0'
wangela marked this conversation as resolved.
Show resolved Hide resolved
pod 'Google-Maps-iOS-Utils', :path => '../..'
end
4 changes: 2 additions & 2 deletions samples/SwiftDemoApp/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://cdn.cocoapods.org/'
platform :ios, '13.0'
platform :ios, '14.0'

target 'SwiftDemoApp' do
use_frameworks!
pod 'GoogleMaps', '~> 7.3'
pod 'GoogleMaps', '7.4.0'
wangela marked this conversation as resolved.
Show resolved Hide resolved
pod 'Google-Maps-iOS-Utils', :path => '../..', :testspecs => ['Tests']
end
8 changes: 4 additions & 4 deletions samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -343,7 +343,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -361,7 +361,7 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = SwiftDemoApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -380,7 +380,7 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = SwiftDemoApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down