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.

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

chore: upgrade deployment target to 12.0 according Xcode 15 #141

Merged
merged 6 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
115 changes: 98 additions & 17 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ concurrency:
cancel-in-progress: true

env:
XCODE_VERSION: '14.3.1'
RUBY_VERSION: '3.3.1'
XCODE_VERSION: '15.1'
RUBY_VERSION: '3.1'

jobs:
sdk:
test:
name: Test SDK
runs-on: macOS-latest
runs-on: macos-latest
steps:
- uses: actions/checkout@v4

Expand All @@ -39,24 +39,100 @@ jobs:
restore-keys: |
${{ runner.os }}-carthage-v2

- run: brew upgrade carthage

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- run: |
bundle exec fastlane ci
cp .lint/cocoapods-size/result.json cocoapods-size-result.json
bundle exec fastlane test
timeout-minutes: 15

- if: github.event_name == 'push'
run: |
bundle exec fastlane pod_size
cp .lint/cocoapods-size/result.json cocoapods-size-result.json

- if: github.event_name == 'push'
uses: actions/cache@v4
with:
path: cocoapods-size-result.json
key: cocoapods-size-${{ github.sha }}

sources-lint:
name: Lint Source files
needs: test
runs-on: macos-14
steps:
- uses: actions/checkout@v4

- name: Use Xcode ${{ env.XCODE_VERSION }}
run: sudo xcode-select -switch /Applications/Xcode_${XCODE_VERSION}.app

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- run: bundle exec fastlane swift_lint

- run: bundle exec fastlane html_lint

- run: bundle exec fastlane xcprivacy_lint

pod-lint:
name: Lint Podspec
needs: test
runs-on: macos-14
steps:
- uses: actions/checkout@v4

- name: Use Xcode ${{ env.XCODE_VERSION }}
run: sudo xcode-select -switch /Applications/Xcode_${XCODE_VERSION}.app

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- run: bundle exec fastlane pod_lint

carthage-build:
name: Carthage Build
needs: test
runs-on: macos-14
steps:
- uses: actions/checkout@v4

- name: Use Xcode ${{ env.XCODE_VERSION }}
run: sudo xcode-select -switch /Applications/Xcode_${XCODE_VERSION}.app

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- run: brew upgrade carthage

- run: bundle exec fastlane carthage_build

swift-package-build:
name: Swift Package Build
needs: test
runs-on: macos-14
steps:
- uses: actions/checkout@v4

- name: Use Xcode ${{ env.XCODE_VERSION }}
run: sudo xcode-select -switch /Applications/Xcode_${XCODE_VERSION}.app

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- run: bundle exec fastlane spm_build

size-report:
name: Cocoapods size report
if: github.event_name == 'pull_request'
Expand Down Expand Up @@ -105,7 +181,7 @@ jobs:
issue-number: ${{ github.event.pull_request.number }}
body-includes: Cocoapods size report

- uses: peter-evans/create-or-update-comment@v3
- uses: peter-evans/create-or-update-comment@v4
with:
body: |
Cocoapods size report:
Expand All @@ -122,18 +198,18 @@ jobs:

samples:
name: Build Samples
needs: sdk
runs-on: macos-12
needs: test
runs-on: macos-14
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
xcode: [ '13.1' ]
xcode: [ '15.1' ]
experimental: [ false ]
include:
- xcode: '13.4.1'
experimental: true
- xcode: '14.2'
- xcode: '15.2'
experimental: false
- xcode: '15.4'
experimental: true
steps:
- uses: actions/checkout@v4
Expand All @@ -154,8 +230,13 @@ jobs:
release:
name: Release
if: github.event_name == 'release'
needs: samples
runs-on: macOS-latest
needs:
- sources-lint
- pod-lint
- carthage-build
- swift-package-build
- samples
runs-on: macos-latest
steps:
- uses: actions/checkout@v4

Expand Down
20 changes: 10 additions & 10 deletions Example/HCaptcha.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -74,7 +74,7 @@
607FACDA1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
607FACDC1AFB9204008FA782 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
607FACDF1AFB9204008FA782 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
62C1DD0E80E9920845E5DA51 /* HCaptcha.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = HCaptcha.podspec; path = ../HCaptcha.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
62C1DD0E80E9920845E5DA51 /* HCaptcha.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = HCaptcha.podspec; path = ../HCaptcha.podspec; sourceTree = "<group>"; };
7CAE52D12DDE8FC56C961E7D /* Pods-HCaptcha_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HCaptcha_Example.release.xcconfig"; path = "Target Support Files/Pods-HCaptcha_Example/Pods-HCaptcha_Example.release.xcconfig"; sourceTree = "<group>"; };
8352086EA5EE39AFD3CDA308 /* Pods_HCaptcha_Objc_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HCaptcha_Objc_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8453AB7DC2F84E620BCFA704 /* Pods-HCaptcha_Objc_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HCaptcha_Objc_Example.release.xcconfig"; path = "Target Support Files/Pods-HCaptcha_Objc_Example/Pods-HCaptcha_Objc_Example.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -878,7 +878,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 = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -927,7 +927,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 = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down Expand Up @@ -1082,7 +1082,7 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1123,7 +1123,7 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1153,7 +1153,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = HCaptcha_UITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1181,7 +1181,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = HCaptcha_UITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1206,7 +1206,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = HCaptcha_Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1230,7 +1230,7 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = HCaptcha_Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, 9.0
platform :ios, 12.0

use_frameworks!
inhibit_all_warnings!
Expand Down Expand Up @@ -37,7 +37,7 @@ post_install do |installer|

installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
end
end
end
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
AppSwizzle: db36e436f56110d93e5ae0147683435df593cabc
HCaptcha: 0e52ee5303201606c66ce141444ca8c8083013d5
HCaptcha: 86b9cf68e49e5dd74b1fdb99d7efa8353de7c521
RxBlocking: 0b29f7d2079109a8de49c411381bed7c33ef1eeb
RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52

PODFILE CHECKSUM: 44657674683c7639f916ef6eb6fae5387395d652
PODFILE CHECKSUM: 3162e929d9aa7ec9db00c1885dad26a9f8fe43de

COCOAPODS: 1.15.1
2 changes: 1 addition & 1 deletion HCaptcha.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ invisibility is not possible.
s.social_media_url = 'https://twitter.com/hCaptcha'
s.documentation_url = 'https://github.com/hCaptcha/HCaptcha-ios-sdk'

s.ios.deployment_target = '9.0'
s.ios.deployment_target = '12.0'
s.default_subspecs = 'Core'

s.subspec 'Core' do |core|
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ Standard SPM formula: uses [Package.swift](./Package.swift)

## Requirements

| Platform | Requirements |
|----------|---------------------------|
| iOS | :white_check_mark: >= 9.0 |
| WatchOS | :heavy_multiplication_x: |
| Platform | Requirements |
|----------|----------------------------|
| iOS | :white_check_mark: >= 12.0 |
| WatchOS | :heavy_multiplication_x: |

## Usage

Expand Down
Loading