Merge pull request #1750 from ably/xcode-14.3

Fix compilation errors in Xcode 14.3
ably · May 15, 2023 · eff260a · eff260a
2 parents eace43c + 3f0307b
commit eff260a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Source/ARTTypes.m b/Source/ARTTypes.m
@@ -29,7 +29,7 @@ NSTimeInterval millisecondsToTimeInterval(uint64_t msecs) {
     return ((NSTimeInterval)msecs) / 1000;
 }
 
-NSString *generateNonce() {
+NSString *generateNonce(void) {
     // Generate two random numbers up to 8 digits long and concatenate them to produce a 16 digit random number
     NSUInteger r1 = arc4random_uniform(100000000);
     NSUInteger r2 = arc4random_uniform(100000000);

diff --git a/Source/SocketRocket/ARTSRWebSocket.m b/Source/SocketRocket/ARTSRWebSocket.m
@@ -45,7 +45,7 @@
 #error SocketRocket must be compiled with ARC enabled
 #endif
 
-__attribute__((used)) static void importCategories()
+__attribute__((used)) static void importCategories(void)
 {
     import_NSURLRequest_ARTSRWebSocket();
     import_NSRunLoop_ARTSRWebSocket();

diff --git a/Source/SocketRocket/NSRunLoop+ARTSRWebSocket.m b/Source/SocketRocket/NSRunLoop+ARTSRWebSocket.m
@@ -15,7 +15,7 @@
 #import "ARTSRRunLoopThread.h"
 
 // Required for object file to always be linked.
-void import_NSRunLoop_ARTSRWebSocket() { }
+void import_NSRunLoop_ARTSRWebSocket(void) { }
 
 @implementation NSRunLoop (ARTSRWebSocket)
 

diff --git a/Source/SocketRocket/NSURLRequest+ARTSRWebSocket.m b/Source/SocketRocket/NSURLRequest+ARTSRWebSocket.m
@@ -13,7 +13,7 @@
 #import "NSURLRequest+ARTSRWebSocketPrivate.h"
 
 // Required for object file to always be linked.
-void import_NSURLRequest_ARTSRWebSocket() { }
+void import_NSURLRequest_ARTSRWebSocket(void) { }
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Test/Tests/RealtimeClientChannelTests.swift b/Test/Tests/RealtimeClientChannelTests.swift
@@ -2816,7 +2816,7 @@ class RealtimeClientChannelTests: XCTestCase {
         channelOne.publish("i", data: ["expectedBundle": 5], clientId: "bar")
         channelOne.publish("j", data: ["expectedBundle": 6])
         // RTL6d1
-        channelOne.publish("k", data: ["expectedBundle": 7, "moreData": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"])
+        channelOne.publish("k", data: ["expectedBundle": 7, "moreData": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] as [String : Any])
         channelOne.publish("l", data: ["expectedBundle": 8])
         // RTL6d7
         channelOne.publish([ARTMessage(id: "bundle_m", name: "m", data: ["expectedBundle": 9])])

diff --git a/Test/Tests/UtilitiesTests.swift b/Test/Tests/UtilitiesTests.swift
@@ -46,12 +46,12 @@ class UtilitiesTests: XCTestCase {
     func test__001__Utilities__JSON_Encoder__should_decode_a_protocol_message_that_has_an_error_without_a_message() throws {
         beforeEach__Utilities__JSON_Encoder()
 
-        let jsonObject: NSDictionary = [
+        let jsonObject: [String : Any] = [
             "action": 9,
             "error": [
                 "code": 40142,
                 "statusCode": "401",
-            ],
+            ] as [String : Any],
         ]
         let data = try JSONSerialization.data(withJSONObject: jsonObject, options: [])
         guard let protocolMessage = try? jsonEncoder.decodeProtocolMessage(data) else {