Fix a build error on linux: kCFStringEncodingUTF8 is not defined. (#…

…173) Instead, use `CFStringBuiltInEncodings.UTF8.rawValue`. Also fix a type error I was getting in a unit test. Co-authored-by: adaml <adam@seesaw.me>
OpenCombine · Jul 21, 2020 · 0ca4c76 · 0ca4c76
1 parent 8cf59d6
commit 0ca4c76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Sources/OpenCombineFoundation/Timer+Publisher.swift b/Sources/OpenCombineFoundation/Timer+Publisher.swift
@@ -337,11 +337,17 @@ extension RunLoop.Mode {
         return CFRunLoopMode(rawValue as CFString)
 #else
         return rawValue.withCString {
-            CFStringCreateWithCString(
-                nil,
-                $0,
-                CFStringEncoding(kCFStringEncodingUTF8)
-            )
+#if swift(>=5.3)
+          let encoding = CFStringBuiltInEncodings.UTF8.rawValue
+#else
+          let encoding = CFStringEncoding(kCFStringEncodingUTF8)
+#endif // swift(>=5.3)
+
+          return CFStringCreateWithCString(
+              nil,
+              $0,
+              encoding
+          )
         }
 #endif
     }

diff --git a/Tests/OpenCombineTests/PublisherTests/CollectTests.swift b/Tests/OpenCombineTests/PublisherTests/CollectTests.swift
@@ -29,7 +29,7 @@ final class CollectTests: XCTestCase {
 
     func testtestUpstreamFinishesImmediately() {
         ReduceTests.testUpstreamFinishesImmediately(expectedSubscription: "Collect",
-                                                    expectedResult: [],
+                                                    expectedResult: [Int](),
                                                     { $0.collect() })
     }