Skip to content

Commit

Permalink
Bump deployment target to iOS 13 / tvOS 13 / macOS 10.15 (#3615)
Browse files Browse the repository at this point in the history
  • Loading branch information
NachoSoto authored and MarkVillacampa committed Apr 9, 2024
1 parent dc10630 commit a00aa10
Show file tree
Hide file tree
Showing 14 changed files with 60 additions and 100 deletions.
34 changes: 0 additions & 34 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -701,35 +701,6 @@ jobs:
path: fastlane/test_output/xctest
destination: scan-test-output

run-test-ios-12:
<<: *base-job
# M1 unsupported
resource_class: macos.x86.medium.gen2
steps:
- checkout
- install-dependencies
- update-spm-installation-commit
- install-runtime:
runtime-name: iOS 12.4
- run:
name: Run tests
command: bundle exec fastlane test_ios
no_output_timeout: 5m
environment:
SCAN_DEVICE: iPhone 6 (12.4)
- compress_result_bundle:
directory: fastlane/test_output/xctest/ios
bundle_name: RevenueCat
- create-snapshot-pr-if-needed:
condition: << pipeline.parameters.generate_snapshots >>
job: "create_snapshot_pr"
version: "ios-12"
- store_test_results:
path: fastlane/test_output
- store_artifacts:
path: fastlane/test_output/xctest
destination: scan-test-output

build-tv-watch-and-macos:
<<: *base-job
steps:
Expand Down Expand Up @@ -1117,8 +1088,6 @@ workflows:
xcode_version: '14.2.0'
- run-test-ios-13:
xcode_version: '14.2.0'
- run-test-ios-12:
xcode_version: '14.2.0'
- run-test-macos:
xcode_version: '15.2'

Expand Down Expand Up @@ -1179,9 +1148,6 @@ workflows:
- run-test-ios-13:
xcode_version: '14.2.0'
<<: *release-branches-and-main
- run-test-ios-12:
xcode_version: '14.2.0'
<<: *release-branches-and-main
- build-tv-watch-and-macos:
xcode_version: '15.2'
- build-visionos:
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ let package = Package(
name: "RevenueCat",
defaultLocalization: "en",
platforms: [
.macOS(.v10_13),
.macOS(.v10_15),
.watchOS("6.2"),
.tvOS(.v11),
.iOS(.v11),
.tvOS(.v13),
.iOS(.v13),
.visionOS(.v1)
],
products: [
Expand Down
6 changes: 3 additions & 3 deletions Package@swift-5.7.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ let package = Package(
name: "RevenueCat",
defaultLocalization: "en",
platforms: [
.macOS(.v10_13),
.macOS(.v10_15),
.watchOS("6.2"),
.tvOS(.v11),
.iOS(.v11)
.tvOS(.v13),
.iOS(.v13)
],
products: [
.library(name: "RevenueCat",
Expand Down
6 changes: 3 additions & 3 deletions Package@swift-5.8.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ let package = Package(
name: "RevenueCat",
defaultLocalization: "en",
platforms: [
.macOS(.v10_13),
.macOS(.v10_15),
.watchOS("6.2"),
.tvOS(.v11),
.iOS(.v11)
.tvOS(.v13),
.iOS(.v13)
],
products: [
.library(name: "RevenueCat",
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ Or view our iOS sample apps:

| Platform | Minimum target |
| --- | --- |
| iOS | 11.0+ |
| tvOS | 11.0+ |
| macOS | 10.13+ |
| iOS | 13.0+ |
| tvOS | 13.0+ |
| macOS | 10.15+ |
| watchOS | 6.2+ |
| visionOS | 1.0+ |

Expand Down
6 changes: 3 additions & 3 deletions RevenueCat.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Pod::Spec.new do |s|
s.framework = 'StoreKit'
s.swift_version = '5.7'

s.ios.deployment_target = '11.0'
s.ios.deployment_target = '13.0'
s.watchos.deployment_target = '6.2'
s.tvos.deployment_target = '11.0'
s.osx.deployment_target = '10.13'
s.tvos.deployment_target = '13.0'
s.osx.deployment_target = '10.15'
s.visionos.deployment_target = '1.0'

s.pod_target_xcconfig = {
Expand Down
32 changes: 6 additions & 26 deletions RevenueCat.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -4102,13 +4102,11 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8SXR2327BM;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand All @@ -4121,7 +4119,6 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UnitTestsHostApp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UnitTestsHostApp";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -4135,13 +4132,11 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 8SXR2327BM;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 1.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.revenuecat.StoreKitUnitTests;
Expand All @@ -4152,7 +4147,6 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UnitTestsHostApp.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/UnitTestsHostApp";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand Down Expand Up @@ -4245,7 +4239,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 8SXR2327BM;
INFOPLIST_FILE = Tests/UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -4262,8 +4255,6 @@
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 12.0;
WATCHOS_DEPLOYMENT_TARGET = 7.0;
};
name = Debug;
};
Expand All @@ -4278,7 +4269,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 8SXR2327BM;
INFOPLIST_FILE = Tests/UnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -4293,8 +4283,6 @@
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 12.0;
WATCHOS_DEPLOYMENT_TARGET = 7.0;
};
name = Release;
};
Expand Down Expand Up @@ -4377,7 +4365,6 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 14.1;
WATCHOS_DEPLOYMENT_TARGET = 6.2;
};
name = Debug;
};
Expand All @@ -4404,7 +4391,6 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 14.1;
WATCHOS_DEPLOYMENT_TARGET = 6.2;
};
name = Release;
};
Expand All @@ -4418,7 +4404,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 8SXR2327BM;
INFOPLIST_FILE = Tests/UnitTestsHostApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4448,7 +4433,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 8SXR2327BM;
INFOPLIST_FILE = Tests/UnitTestsHostApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4517,8 +4501,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 10.13;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -4527,7 +4511,7 @@
SWIFT_STRICT_CONCURRENCY = targeted;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
WATCHOS_DEPLOYMENT_TARGET = 6.2;
Expand Down Expand Up @@ -4580,8 +4564,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACOSX_DEPLOYMENT_TARGET = 10.13;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -4591,7 +4575,7 @@
SWIFT_STRICT_CONCURRENCY = targeted;
SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
SWIFT_VERSION = 5.0;
TVOS_DEPLOYMENT_TARGET = 11.0;
TVOS_DEPLOYMENT_TARGET = 13.0;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -4666,7 +4650,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 8SXR2327BM;
INFOPLIST_FILE = "Tests/ReceiptParserTests/ReceiptParserTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -4682,7 +4665,6 @@
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "";
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -4697,7 +4679,6 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 8SXR2327BM;
INFOPLIST_FILE = "Tests/ReceiptParserTests/ReceiptParserTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -4711,7 +4692,6 @@
SUPPORTS_MACCATALYST = YES;
SWIFT_OBJC_BRIDGING_HEADER = "";
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions RevenueCatUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Pod::Spec.new do |s|
# RevenueCatUI APIs are not available in all these platforms / versions, however retaining this support at the Pod level
# allows us to depend on it in the same platforms as RevenueCat.
# Opening support allows us to depend on it in the same platforms as RevenueCat.
s.ios.deployment_target = '11.0'
s.ios.deployment_target = '13.0'
s.watchos.deployment_target = '6.2'
s.tvos.deployment_target = '11.0'
s.osx.deployment_target = '10.13'
s.tvos.deployment_target = '13.0'
s.osx.deployment_target = '10.15'
s.visionos.deployment_target = '1.0'

s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
Expand Down
6 changes: 3 additions & 3 deletions Sources/Support/SwiftVersionCheck.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import Foundation

#if swift(<5.5.2)
// See https://xcodereleases.com
#error("RevenueCat requires Xcode 14.0 with Swift 5.5.2 to compile.")
#if swift(<5.7)
// See https://xcodereleases.com and https://swiftversion.net
#error("RevenueCat requires Xcode 14.0 with Swift 5.7 to compile.")
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -356,7 +355,6 @@
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 12.0;
};
name = Debug;
};
Expand All @@ -377,7 +375,6 @@
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -393,7 +390,6 @@
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3,4,6";
TVOS_DEPLOYMENT_TARGET = 12.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down Expand Up @@ -450,11 +446,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 11.3;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
TVOS_DEPLOYMENT_TARGET = 13.0;
WATCHOS_DEPLOYMENT_TARGET = 6.2;
XROS_DEPLOYMENT_TARGET = 1.0;
};
name = Debug;
};
Expand Down Expand Up @@ -504,10 +504,14 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 11.3;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
TVOS_DEPLOYMENT_TARGET = 13.0;
WATCHOS_DEPLOYMENT_TARGET = 6.2;
XROS_DEPLOYMENT_TARGET = 1.0;
};
name = Release;
};
Expand Down
Loading

0 comments on commit a00aa10

Please sign in to comment.