Android support (#1230)

marcprux · web-flow · commit 470cf73260e3 · 2025-02-11T10:40:26.000+01:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -89,3 +89,10 @@ jobs:
       - uses: actions/checkout@v1
       - name: Linux
         run: swift test --parallel
+
+  Android:
+    runs-on: [ubuntu-24.04]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run Android Tests
+        uses: skiptools/swift-android-action@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ The changelog for **SwifterSwift**. Also see the [releases](https://github.com/S
 
 ## Upcoming Release
 ### Added
+- **Android**
+  - Added Android platform support. [#1230](https://github.com/SwifterSwift/SwifterSwift/pull/1230) by [Marc Prud'hommeaux](https://github.com/marcprux)
 
 ### Changed
 - **String**
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@
 [![MIT](https://img.shields.io/badge/License-MIT-red.svg)](https://opensource.org/licenses/MIT)
 [![Slack Channel](https://img.shields.io/badge/Slack-SwifterSwift-green.svg)](https://join.slack.com/t/swifterswift/shared_invite/zt-s6dl4g2e-R5V5baIawGpdUz2heShjiQ)
 
-SwifterSwift is a collection of **over 500 native Swift extensions**, with handy methods, syntactic sugar, and performance improvements for wide range of primitive data types, UIKit and Cocoa classes –over 500 in 1– for iOS, macOS, tvOS, watchOS and Linux.
+SwifterSwift is a collection of **over 500 native Swift extensions**, with handy methods, syntactic sugar, and performance improvements for wide range of primitive data types, UIKit and Cocoa classes –over 500 in 1– for iOS, macOS, tvOS, watchOS, Linux, and Android.
 
 [简体中文](README_CN.md)
 
diff --git a/Sources/SwifterSwift/CoreAnimation/CAGradientLayerExtensions.swift b/Sources/SwifterSwift/CoreAnimation/CAGradientLayerExtensions.swift
@@ -1,6 +1,6 @@
 // CAGradientLayerExtensions.swift - Copyright 2025 SwifterSwift
 
-#if !os(watchOS) && !os(Linux) && canImport(QuartzCore)
+#if !os(watchOS) && !os(Linux) && !os(Android) && canImport(QuartzCore)
 import QuartzCore
 
 public extension CAGradientLayer {
diff --git a/Sources/SwifterSwift/Dispatch/DispatchQueueExtensions.swift b/Sources/SwifterSwift/Dispatch/DispatchQueueExtensions.swift
@@ -6,7 +6,7 @@ import Dispatch
 // MARK: - Properties
 
 public extension DispatchQueue {
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     /// SwifterSwift: A Boolean value indicating whether the current dispatch queue is the main queue.
     static var isMainQueue: Bool {
         enum Static {
@@ -51,7 +51,7 @@ public extension DispatchQueue {
         asyncAfter(deadline: .now() + delay, qos: qos, flags: flags, execute: work)
     }
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     @available(macOS 14.0, iOS 17.0, tvOS 17.0, watchOS 10.0, *)
     func debounce(delay: Double, action: @escaping () -> Void) -> () -> Void {
         // http://stackoverflow.com/questions/27116684/how-can-i-debounce-a-method-call
diff --git a/Sources/SwifterSwift/Foundation/DateExtensions.swift b/Sources/SwifterSwift/Foundation/DateExtensions.swift
@@ -5,6 +5,8 @@ import Foundation
 
 #if os(macOS) || os(iOS)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif os(Linux)
 import Glibc
 #endif
@@ -59,7 +61,7 @@ public extension Date {
         return calendar.component(.era, from: self)
     }
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     /// SwifterSwift: Quarter.
     ///
     ///		Date().quarter -> 3 // date in third quarter of the year.
@@ -609,7 +611,7 @@ public extension Date {
 
     // swiftlint:enable cyclomatic_complexity
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
 
     /// SwifterSwift: Data at the beginning of calendar component.
     ///
diff --git a/Sources/SwifterSwift/Foundation/FileManagerExtensions.swift b/Sources/SwifterSwift/Foundation/FileManagerExtensions.swift
@@ -20,7 +20,7 @@ public extension FileManager {
         return json as? [String: Any]
     }
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     /// SwifterSwift: Read from a JSON file with a given filename.
     ///
     /// - Parameters:
diff --git a/Sources/SwifterSwift/Foundation/NSAttributedStringExtensions.swift b/Sources/SwifterSwift/Foundation/NSAttributedStringExtensions.swift
@@ -15,7 +15,7 @@ import AppKit
 
 public extension NSAttributedString {
     /// SwifterSwift: Bolded string using the system font.
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     var bolded: NSAttributedString {
         guard !string.isEmpty else { return self }
 
@@ -33,7 +33,7 @@ public extension NSAttributedString {
     }
     #endif
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     /// SwifterSwift: Underlined string.
     var underlined: NSAttributedString {
         return applying(attributes: [.underlineStyle: NSUnderlineStyle.single.rawValue])
@@ -59,7 +59,7 @@ public extension NSAttributedString {
     }
     #endif
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     /// SwifterSwift: Struckthrough string.
     var struckthrough: NSAttributedString {
         return applying(attributes: [.strikethroughStyle: NSNumber(value: NSUnderlineStyle.single.rawValue)])
diff --git a/Sources/SwifterSwift/Foundation/NSRegularExpressionExtensions.swift b/Sources/SwifterSwift/Foundation/NSRegularExpressionExtensions.swift
@@ -21,7 +21,7 @@ public extension NSRegularExpression {
     ///   - stop:
     ///     A reference to a Boolean value. The Block can set the value to true to stop further processing of the array.
     /// The stop argument is an out-only argument. You should only ever set this Boolean to true within the Block.
-    #if os(Linux)
+    #if os(Linux) || os(Android)
     func enumerateMatches(in string: String,
                           options: MatchingOptions = [],
                           range: Range<String.Index>,
diff --git a/Sources/SwifterSwift/Foundation/UserDefaultsExtensions.swift b/Sources/SwifterSwift/Foundation/UserDefaultsExtensions.swift
@@ -1,6 +1,6 @@
 // UserDefaultsExtensions.swift - Copyright 2025 SwifterSwift
 
-#if canImport(Foundation) && !os(Linux)
+#if canImport(Foundation) && !os(Linux) && !os(Android)
 import Foundation
 
 // MARK: - Methods
diff --git a/Sources/SwifterSwift/Shared/ColorExtensions.swift b/Sources/SwifterSwift/Shared/ColorExtensions.swift
@@ -1,6 +1,6 @@
 // ColorExtensions.swift - Copyright 2025 SwifterSwift
 
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 
 #if canImport(UIKit)
 import UIKit
diff --git a/Sources/SwifterSwift/SwiftStdlib/CollectionExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/CollectionExtensions.swift
@@ -63,7 +63,7 @@ public extension Collection {
         return slices
     }
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     /// SwifterSwift: Get all indices where condition is met.
     ///
     ///     [1, 7, 1, 2, 4, 1, 8].indices(where: { $0 == 1 }) -> [0, 2, 5]
diff --git a/Sources/SwifterSwift/SwiftStdlib/DoubleExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/DoubleExtensions.swift
@@ -6,6 +6,8 @@ import CoreGraphics
 
 #if os(macOS) || os(iOS)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif os(Linux)
 import Glibc
 #endif
diff --git a/Sources/SwifterSwift/SwiftStdlib/FloatExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/FloatExtensions.swift
@@ -6,6 +6,8 @@ import CoreGraphics
 
 #if os(macOS) || os(iOS)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif os(Linux)
 import Glibc
 #endif
diff --git a/Sources/SwifterSwift/SwiftStdlib/IntExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/IntExtensions.swift
@@ -6,6 +6,8 @@ import CoreGraphics
 
 #if os(macOS) || os(iOS)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif os(Linux)
 import Glibc
 #endif
diff --git a/Sources/SwifterSwift/SwiftStdlib/StringExtensions.swift b/Sources/SwifterSwift/SwiftStdlib/StringExtensions.swift
@@ -259,7 +259,7 @@ public extension String {
     var isNumeric: Bool {
         let scanner = Scanner(string: self)
         scanner.locale = NSLocale.current
-        #if os(Linux) || targetEnvironment(macCatalyst)
+        #if os(Linux) || os(Android) || targetEnvironment(macCatalyst)
         return scanner.scanDecimal() != nil && scanner.isAtEnd
         #else
         return scanner.scanDecimal(nil) && scanner.isAtEnd
@@ -1246,7 +1246,7 @@ public extension String {
     #endif
 }
 
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 
 // MARK: - NSAttributedString
 
diff --git a/Tests/CoreAnimationTests/CAGradientLayerExtensionsTests.swift b/Tests/CoreAnimationTests/CAGradientLayerExtensionsTests.swift
@@ -3,7 +3,7 @@
 @testable import SwifterSwift
 import XCTest
 
-#if !os(watchOS) && !os(Linux)
+#if !os(watchOS) && !os(Linux) && !os(Android)
 
 final class CAGradientLayerExtensionsTests: XCTestCase {
     @available(macOS 10.14, *)
diff --git a/Tests/DispatchTests/DispatchQueueExtensionsTests.swift b/Tests/DispatchTests/DispatchQueueExtensionsTests.swift
@@ -8,7 +8,7 @@ import Dispatch
 
 @available(macOS 10.15, iOS 13.0, tvOS 13.0, *)
 final class DispatchQueueExtensionsTests: XCTestCase {
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     func testIsMainQueue() async {
         let expect = expectation(description: "isMainQueue")
         let group = DispatchGroup()
@@ -59,7 +59,7 @@ final class DispatchQueueExtensionsTests: XCTestCase {
         await fulfillment(of: [codeShouldBeExecuted], timeout: delay + 1)
     }
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     @available(macOS 14.0, iOS 17.0, tvOS 17.0, watchOS 10.0, *)
     func testDebounce() async {
         var value = 0
diff --git a/Tests/FoundationTests/DateExtensionsTests.swift b/Tests/FoundationTests/DateExtensionsTests.swift
@@ -59,7 +59,7 @@ final class DateExtensionsTests: XCTestCase {
     }
 
     func testQuarter() {
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         let date1 = Date(timeIntervalSince1970: 0)
         XCTAssertEqual(date1.quarter, 1)
 
@@ -627,7 +627,7 @@ final class DateExtensionsTests: XCTestCase {
     }
 
     func testBeginning() {
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         let date = Date()
 
         XCTAssertNotNil(date.beginning(of: .second))
@@ -674,7 +674,7 @@ final class DateExtensionsTests: XCTestCase {
         XCTAssertEqual(date.end(of: .day)?.minute, 59)
         XCTAssertEqual(date.end(of: .day)?.second, 59)
 
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         var endOfWeek = date.beginning(of: .weekOfYear)
         endOfWeek?.add(.day, value: 7)
         endOfWeek?.add(.second, value: -1)
diff --git a/Tests/FoundationTests/FileManagerExtensionsTests.swift b/Tests/FoundationTests/FileManagerExtensionsTests.swift
@@ -8,7 +8,7 @@ import Foundation
 
 final class FileManagerExtensionsTests: XCTestCase {
     func testJSONFromFileAtPath() {
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         do {
             let bundle = Bundle(for: FileManagerExtensionsTests.self)
             let filePath = bundle.path(forResource: "test", ofType: "json")
@@ -40,7 +40,7 @@ final class FileManagerExtensionsTests: XCTestCase {
     }
 
     func testJSONFromFileWithFilename() {
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         do {
             var filename = "test.json" // With extension
             var json = try FileManager.default.jsonFromFile(withFilename: filename, at: FileManagerExtensionsTests.self)
@@ -70,7 +70,7 @@ final class FileManagerExtensionsTests: XCTestCase {
     }
 
     func testInvalidFile() {
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         let filename = "another_test.not_json"
         do {
             let json = try FileManager.default.jsonFromFile(withFilename: filename, at: FileManagerExtensionsTests.self)
diff --git a/Tests/FoundationTests/LocaleExtensionsTests.swift b/Tests/FoundationTests/LocaleExtensionsTests.swift
@@ -23,7 +23,7 @@ final class LocaleExtensionsTests: XCTestCase {
     func testFlagEmoji() {
         XCTAssertEqual(Locale.flagEmoji(forRegionCode: "AC"), "🇦🇨")
         XCTAssertEqual(Locale.flagEmoji(forRegionCode: "ZW"), "🇿🇼")
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         XCTAssertNil(Locale.flagEmoji(forRegionCode: ""))
         XCTAssertNil(Locale.flagEmoji(forRegionCode: "ac"))
         #endif
diff --git a/Tests/FoundationTests/NSAttributedStringExtensionsTests.swift b/Tests/FoundationTests/NSAttributedStringExtensionsTests.swift
@@ -3,7 +3,7 @@
 @testable import SwifterSwift
 import XCTest
 
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 
 #if canImport(Foundation)
 import Foundation
diff --git a/Tests/FoundationTests/NSPredicateExtensionsTests.swift b/Tests/FoundationTests/NSPredicateExtensionsTests.swift
@@ -12,7 +12,7 @@ final class NSPredicateExtensionsTests: XCTestCase {
         let notPredicate = predicate.not
         XCTAssertEqual(notPredicate.compoundPredicateType, .not)
 
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         XCTAssertEqual(notPredicate.subpredicates, [predicate])
         #else
         if let subpredicates = notPredicate.subpredicates as? [NSPredicate] {
@@ -27,7 +27,7 @@ final class NSPredicateExtensionsTests: XCTestCase {
         let andPredicate = predicate1.and(predicate2)
         XCTAssertEqual(andPredicate.compoundPredicateType, .and)
 
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         XCTAssertEqual(andPredicate.subpredicates, [predicate1, predicate2])
         #else
         if let subpredicates = andPredicate.subpredicates as? [NSPredicate] {
@@ -42,7 +42,7 @@ final class NSPredicateExtensionsTests: XCTestCase {
         let orPredicate = predicate1.or(predicate2)
         XCTAssertEqual(orPredicate.compoundPredicateType, .or)
 
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         XCTAssertEqual(orPredicate.subpredicates, [predicate1, predicate2])
         #else
         if let subpredicates = orPredicate.subpredicates as? [NSPredicate] {
@@ -56,7 +56,7 @@ final class NSPredicateExtensionsTests: XCTestCase {
         let notPredicate = !predicate
         XCTAssertEqual(notPredicate.compoundPredicateType, .not)
 
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         XCTAssertEqual(notPredicate.subpredicates, [predicate])
         #else
         if let subpredicates = notPredicate.subpredicates as? [NSPredicate] {
@@ -71,7 +71,7 @@ final class NSPredicateExtensionsTests: XCTestCase {
         let andPredicate = predicate1 + predicate2
         XCTAssertEqual(andPredicate.compoundPredicateType, .and)
 
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         XCTAssertEqual(andPredicate.subpredicates, [predicate1, predicate2])
         #else
         if let subpredicates = andPredicate.subpredicates as? [NSPredicate] {
@@ -86,7 +86,7 @@ final class NSPredicateExtensionsTests: XCTestCase {
         let orPredicate = predicate1 | predicate2
         XCTAssertEqual(orPredicate.compoundPredicateType, .or)
 
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         XCTAssertEqual(orPredicate.subpredicates, [predicate1, predicate2])
         #else
         if let subpredicates = orPredicate.subpredicates as? [NSPredicate] {
diff --git a/Tests/FoundationTests/URLExtensionsTests.swift b/Tests/FoundationTests/URLExtensionsTests.swift
@@ -113,7 +113,7 @@ final class URLExtensionsTests: XCTestCase {
     #endif
 
     func testDropScheme() {
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         let urls: [String: String?] = [
             "https://domain.com/path/other/": "domain.com/path/other/",
             "https://domain.com": "domain.com",
diff --git a/Tests/FoundationTests/UserDefaultsExtensionsTests.swift b/Tests/FoundationTests/UserDefaultsExtensionsTests.swift
diff --git a/Tests/SwiftStdlibTests/CollectionExtensionsTests.swift b/Tests/SwiftStdlibTests/CollectionExtensionsTests.swift
diff --git a/Tests/SwiftStdlibTests/SignedNumericExtensionsTests.swift b/Tests/SwiftStdlibTests/SignedNumericExtensionsTests.swift
diff --git a/Tests/SwiftStdlibTests/StringExtensionsTests.swift b/Tests/SwiftStdlibTests/StringExtensionsTests.swift

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public extension FileManager {`
`20`	`20`	`return json as? [String: Any]`
`21`	`21`	`}`
`22`	`22`
`23`		`- #if !os(Linux)`
	`23`	`+ #if !os(Linux) && !os(Android)`
`24`	`24`	`/// SwifterSwift: Read from a JSON file with a given filename.`
`25`	`25`	`///`
`26`	`26`	`/// - Parameters:`