Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
env:
LC_CTYPE: en_US.UTF-8
LANG: en_US.UTF-8
ABLY_ENV: sandbox
ABLY_ENV: nonprod:sandbox

steps:
- name: Check out repo
Expand Down
32 changes: 16 additions & 16 deletions Ably.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,12 @@
840FCE552C875B8A001163E1 /* ARTDevicePushDetails+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 840FCE522C875B8A001163E1 /* ARTDevicePushDetails+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
8412FDE72661AC37001FE9E6 /* AblyDeltaCodec.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8412FDE12661AC37001FE9E6 /* AblyDeltaCodec.xcframework */; };
8412FDED2661AC37001FE9E6 /* msgpack.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8412FDE32661AC37001FE9E6 /* msgpack.xcframework */; };
842433FA2ED0A65800FAE2FF /* ARTDomainSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = 842433F92ED0A65800FAE2FF /* ARTDomainSelector.m */; };
842433FB2ED0A65800FAE2FF /* ARTDomainSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = 842433F92ED0A65800FAE2FF /* ARTDomainSelector.m */; };
842433FC2ED0A65800FAE2FF /* ARTDomainSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = 842433F92ED0A65800FAE2FF /* ARTDomainSelector.m */; };
842433FE2ED0A67D00FAE2FF /* ARTDomainSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 842433FD2ED0A67D00FAE2FF /* ARTDomainSelector.h */; settings = {ATTRIBUTES = (Private, ); }; };
842433FF2ED0A67D00FAE2FF /* ARTDomainSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 842433FD2ED0A67D00FAE2FF /* ARTDomainSelector.h */; settings = {ATTRIBUTES = (Private, ); }; };
842434002ED0A67D00FAE2FF /* ARTDomainSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = 842433FD2ED0A67D00FAE2FF /* ARTDomainSelector.h */; settings = {ATTRIBUTES = (Private, ); }; };
844B9CCF2C807BC400A260E8 /* ARTDeviceDetails+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 844B9CCE2C807BC400A260E8 /* ARTDeviceDetails+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
844B9CD02C807BC400A260E8 /* ARTDeviceDetails+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 844B9CCE2C807BC400A260E8 /* ARTDeviceDetails+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
844B9CD12C807BC400A260E8 /* ARTDeviceDetails+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 844B9CCE2C807BC400A260E8 /* ARTDeviceDetails+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
Expand Down Expand Up @@ -878,12 +884,6 @@
D72C67DF201AB74000978EBB /* ARTPushActivationStateMachine+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D72C67DE201AB74000978EBB /* ARTPushActivationStateMachine+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
D73691FF1DB788C40062C150 /* ARTAuthDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = D73691FD1DB788C40062C150 /* ARTAuthDetails.h */; settings = {ATTRIBUTES = (Public, ); }; };
D73692001DB788C40062C150 /* ARTAuthDetails.m in Sources */ = {isa = PBXBuildFile; fileRef = D73691FE1DB788C40062C150 /* ARTAuthDetails.m */; };
D737F826263AF4CE0064FA05 /* ARTFallbackHosts.h in Headers */ = {isa = PBXBuildFile; fileRef = D737F824263AF4CE0064FA05 /* ARTFallbackHosts.h */; settings = {ATTRIBUTES = (Private, ); }; };
D737F827263AF4CE0064FA05 /* ARTFallbackHosts.h in Headers */ = {isa = PBXBuildFile; fileRef = D737F824263AF4CE0064FA05 /* ARTFallbackHosts.h */; settings = {ATTRIBUTES = (Private, ); }; };
D737F828263AF4CE0064FA05 /* ARTFallbackHosts.h in Headers */ = {isa = PBXBuildFile; fileRef = D737F824263AF4CE0064FA05 /* ARTFallbackHosts.h */; settings = {ATTRIBUTES = (Private, ); }; };
D737F829263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */ = {isa = PBXBuildFile; fileRef = D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */; };
D737F82A263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */ = {isa = PBXBuildFile; fileRef = D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */; };
D737F82B263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */ = {isa = PBXBuildFile; fileRef = D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */; };
D746AE1D1BBB5207003ECEF8 /* ARTDataQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = D746AE1A1BBB5207003ECEF8 /* ARTDataQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
D746AE1E1BBB5207003ECEF8 /* ARTDataQuery+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = D746AE1B1BBB5207003ECEF8 /* ARTDataQuery+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
D746AE1F1BBB5207003ECEF8 /* ARTDataQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = D746AE1C1BBB5207003ECEF8 /* ARTDataQuery.m */; };
Expand Down Expand Up @@ -1221,6 +1221,8 @@
8412FDE12661AC37001FE9E6 /* AblyDeltaCodec.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = AblyDeltaCodec.xcframework; path = Carthage/Build/AblyDeltaCodec.xcframework; sourceTree = "<group>"; };
8412FDE32661AC37001FE9E6 /* msgpack.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = msgpack.xcframework; path = Carthage/Build/msgpack.xcframework; sourceTree = "<group>"; };
8412FDF42661AC7B001FE9E6 /* Nimble.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Nimble.xcframework; path = Carthage/Build/Nimble.xcframework; sourceTree = "<group>"; };
842433F92ED0A65800FAE2FF /* ARTDomainSelector.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ARTDomainSelector.m; sourceTree = "<group>"; };
842433FD2ED0A67D00FAE2FF /* ARTDomainSelector.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTDomainSelector.h; path = PrivateHeaders/Ably/ARTDomainSelector.h; sourceTree = "<group>"; };
844B9CCE2C807BC400A260E8 /* ARTDeviceDetails+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ARTDeviceDetails+Private.h"; path = "PrivateHeaders/Ably/ARTDeviceDetails+Private.h"; sourceTree = "<group>"; };
84557E7A2E91B1D700596CC6 /* ARTRestAnnotations.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ARTRestAnnotations.m; sourceTree = "<group>"; };
84557E7E2E91B20300596CC6 /* ARTRestAnnotations.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTRestAnnotations.h; path = include/Ably/ARTRestAnnotations.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1314,8 +1316,6 @@
D72C67DE201AB74000978EBB /* ARTPushActivationStateMachine+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ARTPushActivationStateMachine+Private.h"; path = "PrivateHeaders/Ably/ARTPushActivationStateMachine+Private.h"; sourceTree = "<group>"; };
D73691FD1DB788C40062C150 /* ARTAuthDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARTAuthDetails.h; path = include/Ably/ARTAuthDetails.h; sourceTree = "<group>"; };
D73691FE1DB788C40062C150 /* ARTAuthDetails.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTAuthDetails.m; sourceTree = "<group>"; };
D737F824263AF4CE0064FA05 /* ARTFallbackHosts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTFallbackHosts.h; path = PrivateHeaders/Ably/ARTFallbackHosts.h; sourceTree = "<group>"; };
D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ARTFallbackHosts.m; sourceTree = "<group>"; };
D746AE1A1BBB5207003ECEF8 /* ARTDataQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARTDataQuery.h; path = include/Ably/ARTDataQuery.h; sourceTree = "<group>"; };
D746AE1B1BBB5207003ECEF8 /* ARTDataQuery+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ARTDataQuery+Private.h"; path = "PrivateHeaders/Ably/ARTDataQuery+Private.h"; sourceTree = "<group>"; };
D746AE1C1BBB5207003ECEF8 /* ARTDataQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTDataQuery.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1990,6 +1990,8 @@
2124B79A29DB14C000AD8361 /* ARTLogAdapter.m */,
21276CB929EF323100107B5F /* ARTContinuousClock.h */,
21276CBD29EF34AE00107B5F /* ARTContinuousClock.m */,
842433FD2ED0A67D00FAE2FF /* ARTDomainSelector.h */,
842433F92ED0A65800FAE2FF /* ARTDomainSelector.m */,
);
name = Utilities;
sourceTree = "<group>";
Expand All @@ -2015,8 +2017,6 @@
1C578E1D1B3435CA00EF46EC /* ARTFallback.h */,
D77F02A71DAF8099001B3FF9 /* ARTFallback+Private.h */,
1C578E1E1B3435CA00EF46EC /* ARTFallback.m */,
D737F824263AF4CE0064FA05 /* ARTFallbackHosts.h */,
D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */,
D74CBC01212EB58700D090E4 /* ARTNSHTTPURLResponse+ARTPaginated.h */,
D74CBC02212EB58700D090E4 /* ARTNSHTTPURLResponse+ARTPaginated.m */,
D74CBC05212EB5B900D090E4 /* ARTNSMutableURLRequest+ARTPaginated.h */,
Expand Down Expand Up @@ -2139,6 +2139,7 @@
D7D5A69A1CA3D9040071BD6D /* ARTAuthOptions+Private.h in Headers */,
2114D4312D4BCAE20032839A /* ARTRealtime+WrapperSDKProxy.h in Headers */,
96A507B51A37881C0077CDF8 /* ARTNSDate+ARTUtil.h in Headers */,
842433FE2ED0A67D00FAE2FF /* ARTDomainSelector.h in Headers */,
848B1D562DF0947600A1AE5B /* ARTWrapperSDKProxyRealtimeAnnotations.h in Headers */,
D5BB211926AA9A9F00AA5F3E /* ARTNSMutableDictionary+ARTDictionaryUtil.h in Headers */,
215924D92D636E04004A235C /* ARTWrapperSDKProxyRealtimePresence+Private.h in Headers */,
Expand Down Expand Up @@ -2221,7 +2222,6 @@
EBFFAC191E97919C003E7326 /* ARTLocalDevice+Private.h in Headers */,
21B4A7BD2E560F8000687F68 /* ARTErrorInfo+Private.h in Headers */,
211A60DB29D726F800D169C5 /* ARTConnectionStateChangeParams.h in Headers */,
D737F826263AF4CE0064FA05 /* ARTFallbackHosts.h in Headers */,
D746AE4F1BBD84E7003ECEF8 /* ARTChannelOptions.h in Headers */,
848B1D4D2DF093BD00A1AE5B /* ARTWrapperSDKProxyRealtimeAnnotations+Private.h in Headers */,
D7588AF31BFF91B800BB8279 /* ARTURLSessionServerTrust.h in Headers */,
Expand Down Expand Up @@ -2315,6 +2315,7 @@
D710D51C21949C42008F54AD /* ARTLocalDevice.h in Headers */,
D710D4DA21949BF9008F54AD /* ARTPendingMessage.h in Headers */,
2104EFAD2A4CC33300CC1184 /* ARTAttachRetryState.h in Headers */,
842433FF2ED0A67D00FAE2FF /* ARTDomainSelector.h in Headers */,
84557E852E91B21F00596CC6 /* ARTRestAnnotations+Private.h in Headers */,
D710D4B321949B47008F54AD /* ARTRestChannel+Private.h in Headers */,
D710D61C21949DEC008F54AD /* ARTPaginatedResult+Private.h in Headers */,
Expand Down Expand Up @@ -2422,7 +2423,6 @@
D710D48921949A85008F54AD /* ARTConstants.h in Headers */,
D710D60921949DA9008F54AD /* ARTURLSessionServerTrust.h in Headers */,
D710D51621949C42008F54AD /* ARTPush.h in Headers */,
D737F827263AF4CE0064FA05 /* ARTFallbackHosts.h in Headers */,
213AEA302D36E9D30067FD5F /* ARTWrapperSDKProxyRealtime+Private.h in Headers */,
D710D4D521949BF9008F54AD /* ARTRealtimeChannel.h in Headers */,
840FCE542C875B8A001163E1 /* ARTDevicePushDetails+Private.h in Headers */,
Expand Down Expand Up @@ -2524,6 +2524,7 @@
D710D52E21949C44008F54AD /* ARTLocalDevice.h in Headers */,
D710D4EA21949BFB008F54AD /* ARTPendingMessage.h in Headers */,
2104EFAE2A4CC33300CC1184 /* ARTAttachRetryState.h in Headers */,
842434002ED0A67D00FAE2FF /* ARTDomainSelector.h in Headers */,
84557E832E91B21F00596CC6 /* ARTRestAnnotations+Private.h in Headers */,
D710D4B921949B48008F54AD /* ARTRestChannel+Private.h in Headers */,
D710D62821949DED008F54AD /* ARTPaginatedResult+Private.h in Headers */,
Expand Down Expand Up @@ -2631,7 +2632,6 @@
D710D48B21949A86008F54AD /* ARTConstants.h in Headers */,
D710D60B21949DAA008F54AD /* ARTURLSessionServerTrust.h in Headers */,
D710D52821949C44008F54AD /* ARTPush.h in Headers */,
D737F828263AF4CE0064FA05 /* ARTFallbackHosts.h in Headers */,
213AEA312D36E9D30067FD5F /* ARTWrapperSDKProxyRealtime+Private.h in Headers */,
D710D4E521949BFB008F54AD /* ARTRealtimeChannel.h in Headers */,
840FCE552C875B8A001163E1 /* ARTDevicePushDetails+Private.h in Headers */,
Expand Down Expand Up @@ -2935,7 +2935,6 @@
EB2D5A911CC941A700AD1A67 /* ARTRealtimeTransport.m in Sources */,
D746AE391BBC3201003ECEF8 /* ARTMessage.m in Sources */,
211A60FF29D8ABF100D169C5 /* ARTChannelStateChangeParams.m in Sources */,
D737F829263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */,
D7E0FEB9211DE94700659FAA /* ARTNSMutableRequest+ARTRest.m in Sources */,
D7B621991E4A762A00684474 /* ARTPushChannel.m in Sources */,
EB89D40B1C61C6EA007FA5B7 /* ARTRealtimeChannels.m in Sources */,
Expand Down Expand Up @@ -2964,6 +2963,7 @@
D746AE541BBD85C5003ECEF8 /* ARTChannels.m in Sources */,
96BF61541A35B39C004CF2B3 /* ARTRest.m in Sources */,
D7D8F82C1BC2C706009718F2 /* ARTTokenRequest.m in Sources */,
842433FB2ED0A65800FAE2FF /* ARTDomainSelector.m in Sources */,
D7D8F8261BC2C691009718F2 /* ARTTokenDetails.m in Sources */,
D75A3F1C1DDE5B62002A4AAD /* ARTGCD.m in Sources */,
5CC1D9CD2E7C263F005DC3ED /* ARTMessageVersion.m in Sources */,
Expand Down Expand Up @@ -3079,7 +3079,6 @@
D710D4F021949C0D008F54AD /* ARTRealtimePresence.m in Sources */,
D710D4F321949C0D008F54AD /* ARTRealtimeChannels.m in Sources */,
211A610029D8ABF100D169C5 /* ARTChannelStateChangeParams.m in Sources */,
D737F82A263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */,
D710D53521949C54008F54AD /* ARTDevicePushDetails.m in Sources */,
D710D62F21949E03008F54AD /* ARTDataQuery.m in Sources */,
D710D53121949C54008F54AD /* ARTPush.m in Sources */,
Expand Down Expand Up @@ -3108,6 +3107,7 @@
D710D63321949E03008F54AD /* ARTNSHTTPURLResponse+ARTPaginated.m in Sources */,
D710D5D021949D78008F54AD /* ARTAuthOptions.m in Sources */,
D710D5E221949D78008F54AD /* ARTTypes.m in Sources */,
842433FC2ED0A65800FAE2FF /* ARTDomainSelector.m in Sources */,
D710D5DF21949D78008F54AD /* ARTDataEncoder.m in Sources */,
D710D4EE21949C0D008F54AD /* ARTConnection.m in Sources */,
5CC1D9CA2E7C263F005DC3ED /* ARTMessageVersion.m in Sources */,
Expand Down Expand Up @@ -3221,7 +3221,6 @@
217D1859254222F900DFF07E /* ARTSRWebSocket.m in Sources */,
D710D50021949C0E008F54AD /* ARTRealtimePresence.m in Sources */,
D710D50321949C0E008F54AD /* ARTRealtimeChannels.m in Sources */,
D737F82B263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */,
211A610129D8ABF100D169C5 /* ARTChannelStateChangeParams.m in Sources */,
D710D54721949C55008F54AD /* ARTDevicePushDetails.m in Sources */,
D710D63F21949E04008F54AD /* ARTDataQuery.m in Sources */,
Expand Down Expand Up @@ -3252,6 +3251,7 @@
D710D5F621949D79008F54AD /* ARTAuthOptions.m in Sources */,
D710D60821949D79008F54AD /* ARTTypes.m in Sources */,
D710D60521949D79008F54AD /* ARTDataEncoder.m in Sources */,
842433FA2ED0A65800FAE2FF /* ARTDomainSelector.m in Sources */,
D710D4FE21949C0E008F54AD /* ARTConnection.m in Sources */,
215F75FD2922B1DB009E0E76 /* ARTClientInformation.m in Sources */,
5CC1D9CB2E7C263F005DC3ED /* ARTMessageVersion.m in Sources */,
Expand Down
10 changes: 5 additions & 5 deletions Examples/Tests/TestsTests/TestsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TestsTests: XCTestCase {
var responseData: Data?

let postAppExpectation = self.expectation(description: "POST app to sandbox")
let request = NSMutableURLRequest(url: URL(string: "https://sandbox-rest.ably.io:443/apps")!)
let request = NSMutableURLRequest(url: URL(string: "https://sandbox.realtime.ably-nonprod.net:443/apps")!)
request.httpMethod = "POST"
request.httpBody = "{\"keys\":[{}]}".data(using: String.Encoding.utf8)
request.allHTTPHeaderFields = [
Expand Down Expand Up @@ -47,7 +47,7 @@ class TestsTests: XCTestCase {
}

let options = ARTClientOptions(key: key as String)
options.environment = "sandbox"
options.endpoint = "nonprod:sandbox"
let client = ARTRealtime(options: options)

let receiveExpectation = self.expectation(description: "message received")
Expand All @@ -64,17 +64,17 @@ class TestsTests: XCTestCase {

let backgroundRealtimeExpectation = self.expectation(description: "Realtime in a Background Queue")
var realtime: ARTRealtime! //strong reference
URLSession.shared.dataTask(with: URL(string: "https://ably.io")!) { _,_,_ in
URLSession.shared.dataTask(with: URL(string: "https://ably.com")!) { _,_,_ in
realtime = ARTRealtime(key: key as String)
realtime.channels.get("foo").attach { _ in
do { backgroundRealtimeExpectation.fulfill() }
}
} .resume()
}.resume()
self.waitForExpectations(timeout: 10, handler: nil)

let backgroundRestExpectation = self.expectation(description: "Rest in a Background Queue")
var rest: ARTRest! //strong reference
URLSession.shared.dataTask(with: URL(string: "https://ably.io")!) { _,_,_ in
URLSession.shared.dataTask(with: URL(string: "https://ably.com")!) { _,_,_ in
rest = ARTRest(key: key as String)
rest.channels.get("foo").history { result, error in
do { backgroundRestExpectation.fulfill() }
Expand Down
6 changes: 3 additions & 3 deletions Scripts/log-environment-information.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash

# Prints the public IP address of the host machine, and the result of resolving sandbox-realtime.ably.io. Useful information to have in a CI environment.
# Prints the public IP address of the host machine, and the result of resolving sandbox.realtime.ably-nonprod.net. Useful information to have in a CI environment.

set -e

ip=$(curl -s https://api.ipify.org)
echo "Public IP address is: $ip"

echo "Output of \`dig sandbox-realtime.ably.io\`:"
dig sandbox-realtime.ably.io
echo "Output of \`dig sandbox.realtime.ably-nonprod.net\`:"
dig sandbox.realtime.ably-nonprod.net
Loading
Loading