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: update SDK to 2.30.1 and AppSyncRTClient to 3.0.0 #561

Merged
merged 2 commits into from
Feb 1, 2023
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
4 changes: 2 additions & 2 deletions AWSAppSync.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '9.0'
s.swift_version = '5.5.2'

s.dependency 'AWSCore', '~> 2.27.0'
s.dependency 'AWSCore', '~> 2.30.1'
s.dependency 'SQLite.swift', '~> 0.12.2'
s.dependency 'ReachabilitySwift', '5.0.0'
s.dependency 'AppSyncRealTimeClient', '~> 1.7'
s.dependency 'AppSyncRealTimeClient', '~> 3.0.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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class APIKeyBasedConnectionPool: SubscriptionConnectionPool {
func connection(for url: URL, connectionType: SubscriptionConnectionType) -> SubscriptionConnection {

let connectionProvider = endPointToProvider[url.absoluteString] ??
ConnectionProviderFactory.createConnectionProvider(for: url,
ConnectionProviderFactory.createConnectionProvider(for: URLRequest(url: url),
authInterceptor: APIKeyAuthInterceptor(apiKeyProvider.getAPIKey()),
connectionType: connectionType)
endPointToProvider[url.absoluteString] = connectionProvider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class IAMBasedConnectionPool: SubscriptionConnectionPool {
func connection(for url: URL, connectionType: SubscriptionConnectionType) -> SubscriptionConnection {

let connectionProvider = endPointToProvider[url.absoluteString] ??
ConnectionProviderFactory.createConnectionProvider(for: url,
ConnectionProviderFactory.createConnectionProvider(for: URLRequest(url: url),
authInterceptor: IAMAuthInterceptor(credentialProvider,
region: regionType),
connectionType: connectionType)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class LambdaBasedConnectionPool: SubscriptionConnectionPool {
}

let authInterceptor = LambdaAuthInterceptor(authTokenProvider: tokenProvider)
let connectionProvider = ConnectionProviderFactory.createConnectionProvider(for: url,
let connectionProvider = ConnectionProviderFactory.createConnectionProvider(for: URLRequest(url: url),
authInterceptor: authInterceptor,
connectionType: connectionType)
endPointToProvider[url.absoluteString] = connectionProvider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class OIDCBasedConnectionPool: SubscriptionConnectionPool {

let authProvider = AppSyncRealTimeClientOIDCAuthProvider(authProvider: tokenProvider)
let authInterceptor = OIDCAuthInterceptor(authProvider)
let connectionProvider = ConnectionProviderFactory.createConnectionProvider(for: url,
let connectionProvider = ConnectionProviderFactory.createConnectionProvider(for: URLRequest(url: url),
authInterceptor: authInterceptor,
connectionType: connectionType)
endPointToProvider[url.absoluteString] = connectionProvider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class UserPoolsBasedConnectionPool: SubscriptionConnectionPool {

let authProvider = AppSyncRealTimeClientOIDCAuthProvider(authProvider: tokenProvider)
let authInterceptor = OIDCAuthInterceptor(authProvider)
let connectionProvider = ConnectionProviderFactory.createConnectionProvider(for: url,
let connectionProvider = ConnectionProviderFactory.createConnectionProvider(for: URLRequest(url: url),
authInterceptor: authInterceptor,
connectionType: connectionType)
endPointToProvider[url.absoluteString] = connectionProvider
Expand Down
2 changes: 1 addition & 1 deletion AWSAppSyncUnitTests/SubscriptionMiscTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class MockDelayedConnection: SubscriptionConnection {
eventHandler: eventHandler)
DispatchQueue.global().asyncAfter(deadline: DispatchTime.now() + .seconds(secondsToWait)) {

self.subscriptionItem.subscriptionEventHandler(.failed(ConnectionProviderError.other),
self.subscriptionItem.subscriptionEventHandler(.failed(ConnectionProviderError.unknown(payload: nil)),
self.subscriptionItem)
}
return subscriptionItem
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "aws/aws-sdk-ios" ~> 2.27.0
github "aws/aws-sdk-ios" ~> 2.30.1
github "stephencelis/SQLite.swift" ~> 0.12.2
github "aws-amplify/aws-appsync-realtime-client-ios" ~> 1.8
github "aws-amplify/aws-appsync-realtime-client-ios" ~> 3.0.0
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/aws-amplify/aws-appsync-realtime-client-ios.git",
"state": {
"branch": null,
"revision": "1932e1d6289e9f0c9656cefe6218d5097720bf3f",
"version": "1.8.0"
"revision": "3de274c68a3cb60c8aec18b5bc0a8c07860219cd",
"version": "3.0.0"
}
},
{
"package": "AWSiOSSDKV2",
"repositoryURL": "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
"state": {
"branch": null,
"revision": "6eec01dd884f2eea57ea13fdbf23fad1a6562cef",
"version": "2.27.0"
"revision": "477ba09977beda6f259f225f2e4eca37f0a9de05",
"version": "2.30.1"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ let package = Package(
.package(
name: "AWSiOSSDKV2",
url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
.upToNextMinor(from: "2.27.0")
.upToNextMinor(from: "2.30.1")
),
.package(
name: "AppSyncRealTimeClient",
url: "https://github.com/aws-amplify/aws-appsync-realtime-client-ios.git",
from: "1.8.0"
from: "3.0.0"
),
.package(
url: "https://github.com/stephencelis/SQLite.swift.git",
Expand Down
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ platform :ios, "9.0"
use_frameworks!
inhibit_all_warnings!

AWS_SDK_VERSION = "2.27.0"
AWS_SDK_VERSION = "2.30.1"

target "AWSAppSync" do
pod "AWSCore", "~> #{AWS_SDK_VERSION}"
pod "SQLite.swift", "~> 0.12.2"
pod "AppSyncRealTimeClient", "~> 1.8"
pod "AppSyncRealTimeClient", "~> 3.0.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", "~> 1.8"
pod "AppSyncRealTimeClient", "~> 3.0.0"
end

target "AWSAppSyncTestApp" do
Expand Down
60 changes: 30 additions & 30 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
PODS:
- AppSyncRealTimeClient (1.9.0):
- AppSyncRealTimeClient (3.0.0):
- Starscream (~> 4.0.4)
- AWSAuthCore (2.27.1):
- AWSCore (= 2.27.1)
- AWSCognitoIdentityProvider (2.27.1):
- AWSCognitoIdentityProviderASF (= 2.27.1)
- AWSCore (= 2.27.1)
- AWSCognitoIdentityProviderASF (2.27.1):
- AWSCore (= 2.27.1)
- AWSCore (2.27.1)
- AWSMobileClient (2.27.1):
- AWSAuthCore (= 2.27.1)
- AWSCognitoIdentityProvider (= 2.27.1)
- AWSCognitoIdentityProviderASF (= 2.27.1)
- AWSCore (= 2.27.1)
- AWSS3 (2.27.1):
- AWSCore (= 2.27.1)
- AWSAuthCore (2.30.1):
- AWSCore (= 2.30.1)
- AWSCognitoIdentityProvider (2.30.1):
- AWSCognitoIdentityProviderASF (= 2.30.1)
- AWSCore (= 2.30.1)
- AWSCognitoIdentityProviderASF (2.30.1):
- AWSCore (= 2.30.1)
- AWSCore (2.30.1)
- AWSMobileClient (2.30.1):
- AWSAuthCore (= 2.30.1)
- AWSCognitoIdentityProvider (= 2.30.1)
- AWSCognitoIdentityProviderASF (= 2.30.1)
- AWSCore (= 2.30.1)
- AWSS3 (2.30.1):
- AWSCore (= 2.30.1)
- SQLite.swift (0.12.2):
- SQLite.swift/standard (= 0.12.2)
- SQLite.swift/standard (0.12.2)
- Starscream (4.0.4)
- SwiftLint (0.46.3)
- SwiftLint (0.50.3)

DEPENDENCIES:
- AppSyncRealTimeClient (~> 1.8)
- AWSCore (~> 2.27.0)
- AWSMobileClient (~> 2.27.0)
- AWSS3 (~> 2.27.0)
- AppSyncRealTimeClient (~> 3.0.0)
- AWSCore (~> 2.30.1)
- AWSMobileClient (~> 2.30.1)
- AWSS3 (~> 2.30.1)
- SQLite.swift (~> 0.12.2)
- SwiftLint

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

SPEC CHECKSUMS:
AppSyncRealTimeClient: 147743ef36c99e25a47ecd3e8f7b6991ba7e3bdd
AWSAuthCore: 9528c60ccdac6df6024fb0af1ed6a43782fd2d3d
AWSCognitoIdentityProvider: 4de7f96340be72c1dca35c0ba835c6b9b69a28c0
AWSCognitoIdentityProviderASF: 727f7c1c80d667a2da79e408c8c8745eac981d58
AWSCore: f859f6955a8e52dcb3e79fac95fef058639d1049
AWSMobileClient: 9c1edcbe7088b3c9b910aaf6faf2db43a8f1568d
AWSS3: 3389c12e5b0cbfdfb6894c5921c094f58ec84df0
AppSyncRealTimeClient: ec19a24f635611b193eb98a2da573abcf98b793b
AWSAuthCore: 88e77e867b210e5d09e35a484de19753d587aee3
AWSCognitoIdentityProvider: 37ff510e8f64dc6a1240088ba92ad4d6f0cd841e
AWSCognitoIdentityProviderASF: f2cd19990c4ae642ad73d09a4945018a994c9ff8
AWSCore: 493e49f8118e04fa57d927ceb117ba24a9b5ca02
AWSMobileClient: 36d9bb90118da3ba14a87f9999818cb314953c5c
AWSS3: 658aa9e708846ff6755520e602dd6b149bded949
SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
SwiftLint: ae76d82f056734f853c8cd0371503252c606c482
SwiftLint: 77f7cb2b9bb81ab4a12fcc86448ba3f11afa50c6

PODFILE CHECKSUM: 5bba3c7fca3fcfb34ebed8f5c60815314242c652
PODFILE CHECKSUM: 9d9aefc79fd2fd37423c6c74c27e724c1488c62f

COCOAPODS: 1.11.3

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading