Add Android to CI (#126)

* Add Android to CI * Run tests only on platforms where Swift Testing is supported * Remove indentation --------- Co-authored-by: Mahdi Bahrami <[email protected]>
vapor · Feb 26, 2025 · 46aadbe · 46aadbe
1 parent 583d692
commit 46aadbe
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,4 +15,5 @@ jobs:
       with_windows: true
       with_musl: true
       ios_scheme_name: multipart-kit
+      with_android: true
     secrets: inherit
diff --git a/.swift-format b/.swift-format
@@ -5,7 +5,7 @@
   "indentation": {
     "spaces": 4
   },
-  "indentConditionalCompilationBlocks": true,
+  "indentConditionalCompilationBlocks": false,
   "indentSwitchCaseLabels": false,
   "lineBreakAroundMultilineExpressionChainComponents": false,
   "lineBreakBeforeControlFlowKeywords": false,

diff --git a/Sources/MultipartKit/FormDataDecoder/FormDataDecoder+SingleValueContainer.swift b/Sources/MultipartKit/FormDataDecoder/FormDataDecoder+SingleValueContainer.swift
@@ -1,7 +1,7 @@
 #if canImport(FoundationEssentials)
-    import FoundationEssentials
+import FoundationEssentials
 #else
-    import Foundation
+import Foundation
 #endif
 
 extension FormDataDecoder.Decoder: SingleValueDecodingContainer {

diff --git a/Sources/MultipartKit/FormDataEncoder/FormDataEncoder+SingleValueContainer.swift b/Sources/MultipartKit/FormDataEncoder/FormDataEncoder+SingleValueContainer.swift
@@ -1,7 +1,7 @@
 #if canImport(FoundationEssentials)
-    import FoundationEssentials
+import FoundationEssentials
 #else
-    import Foundation
+import Foundation
 #endif
 
 extension FormDataEncoder.Encoder: SingleValueEncodingContainer {

diff --git a/Tests/MultipartKitTests/FormDataDecodingTests.swift b/Tests/MultipartKitTests/FormDataDecodingTests.swift
@@ -1,3 +1,4 @@
+#if canImport(Testing)
 import MultipartKit
 import Testing
 
@@ -304,3 +305,4 @@ struct FormDataDecodingTests {
     }
 
 }
+#endif  // canImport(Testing)
diff --git a/Tests/MultipartKitTests/FormDataEncodingTests.swift b/Tests/MultipartKitTests/FormDataEncodingTests.swift
@@ -1,10 +1,11 @@
+#if canImport(Testing)
 import MultipartKit
 import Testing
 
 #if canImport(FoundationEssentials)
-    import FoundationEssentials
+import FoundationEssentials
 #else
-    import Foundation
+import Foundation
 #endif
 
 @Suite("Form Data Encoding Tests")
@@ -284,3 +285,4 @@ struct FormDataEncodingTests {
         #expect(try FormDataDecoder().decode(AllTypes.self, from: multipart, boundary: "-") == value)
     }
 }
+#endif  // canImport(Testing)
diff --git a/Tests/MultipartKitTests/ParserTests.swift b/Tests/MultipartKitTests/ParserTests.swift
@@ -1,3 +1,4 @@
+#if canImport(Testing)
 import HTTPTypes
 import MultipartKit
 import Testing
@@ -269,3 +270,4 @@ struct ParserTests {
         0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82,
     ]
 }
+#endif  // canImport(Testing)
diff --git a/Tests/MultipartKitTests/SerializerTests.swift b/Tests/MultipartKitTests/SerializerTests.swift
@@ -1,3 +1,4 @@
+#if canImport(Testing)
 import HTTPTypes
 import MultipartKit
 import Testing
@@ -29,3 +30,4 @@ struct SerializerTests {
         #expect(serialized == expected)
     }
 }
+#endif  // canImport(Testing)