Skip to content

Fix skip android sdk install to use the latest released SDK #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcprux merged 3 commits into from
Apr 17, 2026
Merged

Fix skip android sdk install to use the latest released SDK #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb92632
Fix skip android sdk install to use the latest released SDK
marcprux Apr 17, 2026
eec1500
Update build to use Swift 6.3.1
marcprux Apr 17, 2026
54e5f56
Update actions to upload-artifact@v7 and download-artifact@v8
marcprux Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fail-fast: false
matrix:
swift:
- '6.3'
- '6.3.1'
os:
- 'ubuntu-latest'
#- 'macos-latest'
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion Sources/SkipBuild/Commands/AndroidCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import FoundationNetworking
#endif
import ArgumentParser
import TSCBasic
import struct TSCUtility.Version
import ELFKit
#if canImport(SkipDriveExternal)
import SkipDriveExternal
Expand Down Expand Up @@ -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
Expand Down