From eb9263291306d68478e966a5ce8288a463cbb5ac Mon Sep 17 00:00:00 2001
From: Marc Prud'hommeaux <mwp1@cornell.edu>
Date: Fri, 17 Apr 2026 11:51:12 -0400
Subject: [PATCH 1/3] Fix skip android sdk install to use the latest released
 SDK

---
 Sources/SkipBuild/Commands/AndroidCommand.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Sources/SkipBuild/Commands/AndroidCommand.swift b/Sources/SkipBuild/Commands/AndroidCommand.swift
index 903b4857..5f7be7a1 100644
--- a/Sources/SkipBuild/Commands/AndroidCommand.swift
+++ b/Sources/SkipBuild/Commands/AndroidCommand.swift
@@ -8,6 +8,7 @@ import FoundationNetworking
 #endif
 import ArgumentParser
 import TSCBasic
+import struct TSCUtility.Version
 import ELFKit
 #if canImport(SkipDriveExternal)
 import SkipDriveExternal
@@ -466,7 +467,9 @@ struct AndroidSDKInstallCommand: MessageCommand, ToolchainOptionsCommand {
         } else {
             // Look up the latest released Android SDK version
             let sdks = try await SwiftSDKOpenAPI.fetchSDKs(sdkName: "android")
-            guard let latest = sdks.first else {
+            // sort by semantic version so 6.3.1 > 6.3
+            let latestReleases = try? sdks.sorted(by: { try Version(versionString: $0.version, usesLenientParsing: true) < Version(versionString: $1.version, usesLenientParsing: true) })
+            guard let latest = latestReleases?.last ?? sdks.last else {
                 throw AndroidError(errorDescription: "No released Android SDK versions found")
             }
             resolvedVersion = latest.version

From eec1500b1c6ca2559bfb60aea8bff4538a773142 Mon Sep 17 00:00:00 2001
From: Marc Prud'hommeaux <mwp1@cornell.edu>
Date: Fri, 17 Apr 2026 11:57:38 -0400
Subject: [PATCH 2/3] Update build to use Swift 6.3.1

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73ba6175..fe19eb12 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         swift:
-          - '6.3'
+          - '6.3.1'
         os:
           - 'ubuntu-latest'
           #- 'macos-latest'

From 54e5f568b23c2e98fc3857c89ba534077425fc1d Mon Sep 17 00:00:00 2001
From: Marc Prud'hommeaux <mwp1@cornell.edu>
Date: Fri, 17 Apr 2026 12:30:13 -0400
Subject: [PATCH 3/3] Update actions to upload-artifact@v7 and
 download-artifact@v8

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe19eb12..af7d11bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,7 +89,7 @@ jobs:
       - run: skip welcome
 
       - name: "Upload Build Artifacts"
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: skip-plugin-${{ runner.os }}
           path: artifacts/
@@ -143,7 +143,7 @@ jobs:
       - run: swift --version
 
       - name: "Download skip plugin"
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v8
         with:
           name: skip-plugin-${{ runner.os }}
           path: skip-artifact