Update some repo tags and associated patches for the snapshots on the CI

Author: finagolfin

get-packages-and-swift-source.swift

@@ -17,7 +17,7 @@ let extraSwiftRepos = ["swift-llbuild", "swift-package-manager", "swift-driver",
                        "swift-certificates", "swift-asn1", "swift-toolchain-sqlite"]
 let appleRepos = ["swift-argument-parser", "swift-crypto", "swift-system", "swift-collections", "swift-certificates", "swift-asn1"]
 let renameRepos = ["swift-llbuild" : "llbuild", "swift-package-manager" : "swiftpm", "Yams" : "yams"]
-var repoTags = ["swift-system" : "1.4.1", "swift-collections" : "1.1.3", "swift-asn1" : "1.0.0",
+var repoTags = ["swift-system" : "1.5.0", "swift-collections" : "1.1.6", "swift-asn1" : "1.0.0",
                 "swift-certificates" : "1.0.1", "Yams" : "5.0.6", "swift-argument-parser" : "1.4.0",
                 "swift-crypto" : "3.0.0", "swift-toolchain-sqlite" : "1.0.1"]
 if ProcessInfo.processInfo.environment["BUILD_SWIFT_PM"] != nil {
@@ -61,6 +61,13 @@ if swiftBranch == "RELEASE" {
   if ProcessInfo.processInfo.environment["BUILD_SWIFT_PM"] != nil {
     swiftRepos += ["swift-build"]
   }
+  if swiftVersion == "" {
+    repoTags["swift-collections"] = "1.1.6"
+    repoTags["swift-argument-parser"] = "1.5.1"
+    repoTags["swift-crypto"] = "3.12.5"
+    repoTags["swift-certificates"] = "1.10.1"
+    repoTags["swift-asn1"] = "1.3.2"
+  }
 }
 
 // takes the name of a command-line executable and the arguments to pass to it

swift-android-ci-devel.patch

@@ -1,3 +1,34 @@
+diff --git a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift b/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
+index b7fa046..a94e3b8 100644
+--- a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
++++ b/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
+@@ -19,6 +19,8 @@ import Darwin
+ import CRT
+ #elseif canImport(WASILibc)
+ import WASILibc
++#elseif canImport(Android)
++import Android
+ #endif
+ 
+ enum Platform {}
+@@ -88,6 +90,8 @@ extension Platform {
+     ucrt._exit(code)
+ #elseif canImport(WASILibc)
+     WASILibc.exit(code)
++#elseif canImport(Android)
++    Android.exit(code)
+ #endif
+   }
+ }
+@@ -108,7 +112,7 @@ extension Platform {
+ 
+ // MARK: Terminal size
+ 
+-#if canImport(Glibc)
++#if canImport(Glibc) || canImport(Android)
+ func ioctl(_ a: Int32, _ b: Int32, _ p: UnsafeMutableRawPointer) -> Int32 {
+   ioctl(CInt(a), UInt(b), p)
+ }
 diff --git a/swift-build/Sources/SWBUtil/FSProxy.swift b/swift-build/Sources/SWBUtil/FSProxy.swift
 index b446d21..f88f3c3 100644
 --- a/swift-build/Sources/SWBUtil/FSProxy.swift
@@ -85,3 +116,17 @@ index b446d21..f88f3c3 100644
                  return createFileInfo(info)
              }
          }
+diff --git a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
+index 5f47c2f..4b5579e 100644
+--- a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
++++ b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
+@@ -15,6 +15,9 @@
+ @_exported import CryptoKit
+ #else
+ import Foundation
++#if canImport(Android)
++import Android
++#endif
+ 
+ /// A standards-based implementation of an HMAC-based Key Derivation Function
+ /// (HKDF).

swift-android-ci-release.patch

@@ -1,3 +1,48 @@
+diff --git a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift b/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
+index b7fa046..a94e3b8 100644
+--- a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
++++ b/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
+@@ -19,6 +19,8 @@ import Darwin
+ import CRT
+ #elseif canImport(WASILibc)
+ import WASILibc
++#elseif canImport(Android)
++import Android
+ #endif
+ 
+ enum Platform {}
+@@ -88,6 +90,8 @@ extension Platform {
+     ucrt._exit(code)
+ #elseif canImport(WASILibc)
+     WASILibc.exit(code)
++#elseif canImport(Android)
++    Android.exit(code)
+ #endif
+   }
+ }
+@@ -108,7 +112,7 @@ extension Platform {
+ 
+ // MARK: Terminal size
+ 
+-#if canImport(Glibc)
++#if canImport(Glibc) || canImport(Android)
+ func ioctl(_ a: Int32, _ b: Int32, _ p: UnsafeMutableRawPointer) -> Int32 {
+   ioctl(CInt(a), UInt(b), p)
+ }
+diff --git a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
+index 5f47c2f..4b5579e 100644
+--- a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
++++ b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
+@@ -15,6 +15,9 @@
+ @_exported import CryptoKit
+ #else
+ import Foundation
++#if canImport(Android)
++import Android
++#endif
+ 
+ /// A standards-based implementation of an HMAC-based Key Derivation Function
+ /// (HKDF).
 diff --git a/swift-system/Sources/System/Internals/CInterop.swift b/swift-system/Sources/System/Internals/CInterop.swift
 index 13abc75..2ad551a 100644
 --- a/swift-system/Sources/System/Internals/CInterop.swift

swift-android-ci.patch

@@ -40,37 +40,6 @@ index 92a1ee38..52273afb 100644
  add_subdirectory(BuildSystem)
 -add_subdirectory(Ninja)
 +#add_subdirectory(Ninja)
-diff --git a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift b/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
-index b7fa046..a94e3b8 100644
---- a/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
-+++ b/swift-argument-parser/Sources/ArgumentParser/Utilities/Platform.swift
-@@ -19,6 +19,8 @@ import Darwin
- import CRT
- #elseif canImport(WASILibc)
- import WASILibc
-+#elseif canImport(Android)
-+import Android
- #endif
- 
- enum Platform {}
-@@ -88,6 +90,8 @@ extension Platform {
-     ucrt._exit(code)
- #elseif canImport(WASILibc)
-     WASILibc.exit(code)
-+#elseif canImport(Android)
-+    Android.exit(code)
- #endif
-   }
- }
-@@ -108,7 +112,7 @@ extension Platform {
- 
- // MARK: Terminal size
- 
--#if canImport(Glibc)
-+#if canImport(Glibc) || canImport(Android)
- func ioctl(_ a: Int32, _ b: Int32, _ p: UnsafeMutableRawPointer) -> Int32 {
-   ioctl(CInt(a), UInt(b), p)
- }
 diff --git a/swift-certificates/Sources/X509/Verifier/RFC5280/URIConstraints.swift b/swift-certificates/Sources/X509/Verifier/RFC5280/URIConstraints.swift
 --- a/swift-certificates/Sources/X509/Verifier/RFC5280/URIConstraints.swift
 +++ b/swift-certificates/Sources/X509/Verifier/RFC5280/URIConstraints.swift
@@ -84,17 +53,3 @@ diff --git a/swift-certificates/Sources/X509/Verifier/RFC5280/URIConstraints.swi
  #elseif canImport(Darwin)
  import Darwin
  #endif
-diff --git a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
-index 5f47c2f..4b5579e 100644
---- a/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
-+++ b/swift-crypto/Sources/Crypto/Key Derivation/HKDF.swift
-@@ -15,6 +15,9 @@
- @_exported import CryptoKit
- #else
- import Foundation
-+#if canImport(Android)
-+import Android
-+#endif
- 
- /// A standards-based implementation of an HMAC-based Key Derivation Function
- /// (HKDF).