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

feat: upgrade to min deployment version to iOS 12 #586

Merged
merged 7 commits into from
Apr 23, 2024
Merged

feat: upgrade to min deployment version to iOS 12 #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24bf0d7
feat: upgrade to min deployment version to iOS 11
lawmicha Mar 11, 2024
62c11af
bump to 12
lawmicha Mar 13, 2024
9df1592
update aws-sdk-ios version to 2.36.0
5d Apr 23, 2024
5146356
Merge remote-tracking branch 'origin/main' into feat/ios-11
5d Apr 23, 2024
169c91a
Merge remote-tracking branch 'origin/main' into feat/ios-11
5d Apr 23, 2024
e45b3ee
update deployment target to ios 12
5d Apr 23, 2024
fe8af6e
chore: remove redundant gitignore line
5d Apr 23, 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 AWSAppSync.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/awslabs/aws-mobile-appsync-sdk-ios.git',
:tag => s.version }
s.requires_arc = true
s.ios.deployment_target = '9.0'
s.ios.deployment_target = '12.0'
s.swift_version = '5.5.2'

s.dependency 'AWSCore', '~> 2.35.0'
s.dependency 'AWSCore', '~> 2.36.0'
s.dependency 'SQLite.swift', '~> 0.12.2'
s.dependency 'AppSyncRealTimeClient', '~> 3.1.0'
s.dependency 'AppSyncRealTimeClient', '~> 3.2.0'

s.source_files = 'AWSAppSyncClient/AWSAppSync.h', 'AWSAppSyncClient/*.swift', 'AWSAppSyncClient/Internal/**/*.{h,m,swift}', 'AWSAppSyncClient/Apollo/Sources/Apollo/*.swift'
s.public_header_files = ['AWSAppSyncClient/AWSAppSync.h', 'AWSAppSyncClient/AWSAppSync-Swift.h', 'AWSAppSyncClient/Internal/AppSyncLogHelper.h']
Expand Down
36 changes: 18 additions & 18 deletions AWSAppSyncClient.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2265,7 +2265,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ApolloTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2294,7 +2294,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ApolloTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2327,7 +2327,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = StarWarsAPI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2362,7 +2362,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = StarWarsAPI/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2387,7 +2387,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestAppUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
Copy link
Member

Choose a reason for hiding this comment

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

You've downgraded some targets from 12.1 to 12.0.

Just to be sure, did you validate that these changes are safe?

Copy link
Contributor

Choose a reason for hiding this comment

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

Here the AWSAppSyncTestAppUITests is an empty test project. I've verified all the other downgraded targets are success to build.

IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2413,7 +2413,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestAppUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2441,7 +2441,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestHostApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2468,7 +2468,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestHostApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2494,7 +2494,7 @@
DEVELOPMENT_TEAM = W9GWBC2HN3;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -2519,7 +2519,7 @@
DEVELOPMENT_TEAM = W9GWBC2HN3;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2661,7 +2661,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AWSAppSyncClient/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2690,7 +2690,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AWSAppSyncClient/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2719,7 +2719,7 @@
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncUnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2748,7 +2748,7 @@
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncUnitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2776,7 +2776,7 @@
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncIntegrationTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2806,7 +2806,7 @@
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncIntegrationTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2839,7 +2839,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestCommon/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -2872,7 +2872,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = AWSAppSyncTestCommon/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
8 changes: 4 additions & 4 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/aws-amplify/aws-appsync-realtime-client-ios.git",
"state": {
"branch": null,
"revision": "a08684c5004e2049c29f57a5938beae9695a1ef7",
"version": "3.1.2"
"revision": "9fd77b043e06193848a68740dfde0836648b2b4e",
"version": "3.2.0"
}
},
{
Expand All @@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/daltoniam/Starscream",
"state": {
"branch": null,
"revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
"version": "4.0.4"
"revision": "c6bfd1af48efcc9a9ad203665db12375ba6b145a",
"version": "4.0.8"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let package = Package(
.package(
name: "AppSyncRealTimeClient",
url: "https://github.com/aws-amplify/aws-appsync-realtime-client-ios.git",
.upToNextMinor(from: "3.1.0")
.upToNextMinor(from: "3.2.0")
),
.package(
url: "https://github.com/stephencelis/SQLite.swift.git",
Expand All @@ -30,7 +30,7 @@ let package = Package(
.target(
name: "AWSAppSync",
dependencies: [

.product(name: "SQLite", package: "SQLite.swift"),
.product(name: "AppSyncRealTimeClient", package: "AppSyncRealTimeClient"),
.product(name: "AWSCore", package: "AWSiOSSDKV2")
Expand Down
8 changes: 4 additions & 4 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
platform :ios, "9.0"
platform :ios, "12.0"

use_frameworks!
inhibit_all_warnings!

AWS_SDK_VERSION = "2.35.0"
AWS_SDK_VERSION = "2.36.0"

target "AWSAppSync" do
pod "AWSCore", "~> #{AWS_SDK_VERSION}"
pod "SQLite.swift", "~> 0.12.2"
pod "AppSyncRealTimeClient", "~> 3.1.0"
pod "AppSyncRealTimeClient", "~> 3.2.0"

pod "SwiftLint"
end
Expand All @@ -18,7 +18,7 @@ target "AWSAppSyncTestCommon" do
# We directly access a database connection to verify certain initialization
# setups
pod "SQLite.swift", "~> 0.12.2"
pod "AppSyncRealTimeClient", "~> 3.1.0"
pod "AppSyncRealTimeClient", "~> 3.2.0"
end

target "AWSAppSyncTestApp" do
Expand Down
66 changes: 33 additions & 33 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
PODS:
- AppSyncRealTimeClient (3.1.2):
- Starscream (= 4.0.4)
- AWSAuthCore (2.35.0):
- AWSCore (= 2.35.0)
- AWSCognitoIdentityProvider (2.35.0):
- AWSCognitoIdentityProviderASF (= 2.35.0)
- AWSCore (= 2.35.0)
- AWSCognitoIdentityProviderASF (2.35.0):
- AWSCore (= 2.35.0)
- AWSCore (2.35.0)
- AWSMobileClient (2.35.0):
- AWSAuthCore (= 2.35.0)
- AWSCognitoIdentityProvider (= 2.35.0)
- AWSCognitoIdentityProviderASF (= 2.35.0)
- AWSCore (= 2.35.0)
- AWSS3 (2.35.0):
- AWSCore (= 2.35.0)
- AppSyncRealTimeClient (3.2.0):
- Starscream (= 4.0.8)
- AWSAuthCore (2.36.0):
- AWSCore (= 2.36.0)
- AWSCognitoIdentityProvider (2.36.0):
- AWSCognitoIdentityProviderASF (= 2.36.0)
- AWSCore (= 2.36.0)
- AWSCognitoIdentityProviderASF (2.36.0):
- AWSCore (= 2.36.0)
- AWSCore (2.36.0)
- AWSMobileClient (2.36.0):
- AWSAuthCore (= 2.36.0)
- AWSCognitoIdentityProvider (= 2.36.0)
- AWSCognitoIdentityProviderASF (= 2.36.0)
- AWSCore (= 2.36.0)
- AWSS3 (2.36.0):
- AWSCore (= 2.36.0)
- SQLite.swift (0.12.2):
- SQLite.swift/standard (= 0.12.2)
- SQLite.swift/standard (0.12.2)
- Starscream (4.0.4)
- SwiftLint (0.51.0)
- Starscream (4.0.8)
- SwiftLint (0.54.0)

DEPENDENCIES:
- AppSyncRealTimeClient (~> 3.1.0)
- AWSCore (~> 2.35.0)
- AWSMobileClient (~> 2.35.0)
- AWSS3 (~> 2.35.0)
- AppSyncRealTimeClient (~> 3.2.0)
- AWSCore (~> 2.36.0)
- AWSMobileClient (~> 2.36.0)
- AWSS3 (~> 2.36.0)
- SQLite.swift (~> 0.12.2)
- SwiftLint

Expand All @@ -44,17 +44,17 @@ SPEC REPOS:
- SwiftLint

SPEC CHECKSUMS:
AppSyncRealTimeClient: 36ff2f65f330bce7f1d0d2157a4ae5d255483dac
AWSAuthCore: aa5090b8d86389f958c5b916f14dc218b0c20f8e
AWSCognitoIdentityProvider: b4c4d7d78782d62636cb3edfed71472dffe5e6d6
AWSCognitoIdentityProviderASF: 295cac5c59c71c1494a3bac437f4c6284b9a73d3
AWSCore: f644b48f9508301ba5d2692b5a0c418ca47e1673
AWSMobileClient: 6c00da79fef9fcb63311b9b2e2abb7cf45fc7ccd
AWSS3: 062c34dd2765593fe105d1a571d567b62bf26854
AppSyncRealTimeClient: 35c0d2ae28234a9f5daba5dc31402acf45ad802f
AWSAuthCore: 16ad51c6cf9a5a556049401851498f6c0a3aebb7
AWSCognitoIdentityProvider: 454b162e1bf1a10d9fec5cacd9291c021ecbdd22
AWSCognitoIdentityProviderASF: 556ffdfa7ccd0626bc59f784e938b49bccfe3180
AWSCore: 6a3038e6c0b13be3d1fbb4746f98aab44f750e4d
AWSMobileClient: 161fe6a17f872e2e94d88d275c47dd87907beb23
AWSS3: f073fbcd77d59baf4bdaf7a9732747dca477fb3b
SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
SwiftLint: 1b7561918a19e23bfed960e40759086e70f4dba5
Starscream: 19b5533ddb925208db698f0ac508a100b884a1b9
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211

PODFILE CHECKSUM: 4274fcb3deaee92953e6a57b22eea5f821c5d4c1
PODFILE CHECKSUM: 5e218425b76767a14793a18c26000168492e6ce0

COCOAPODS: 1.15.2