From 3030802078e7d876a814f8a914e01d8132086832 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Fri, 3 Jan 2025 17:47:53 +0100
Subject: [PATCH 1/3] Prepare 0.2.1 release

---
 .github/workflows/sdk.yml | 4 ++--
 xbuild/src/download.rs    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index 5b53f19..28f4969 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - run: echo "TOOLCHAIN=$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64" >> $GITHUB_ENV
-    - run: ls $TOOLCHAIN/lib64/clang | xargs -0 printf "CLANG_VERSION=%s" >> $GITHUB_ENV
-    - run: echo "CLANG=$TOOLCHAIN/lib64/clang/$CLANG_VERSION" >> $GITHUB_ENV
+    - run: ls $TOOLCHAIN/lib/clang | xargs -0 printf "CLANG_VERSION=%s" >> $GITHUB_ENV
+    - run: echo "CLANG=$TOOLCHAIN/lib/clang/$CLANG_VERSION" >> $GITHUB_ENV
 
     - run: echo $ANDROID_NDK_LATEST_HOME
     - run: echo $CLANG_VERSION
diff --git a/xbuild/src/download.rs b/xbuild/src/download.rs
index d71a04d..517fa7d 100644
--- a/xbuild/src/download.rs
+++ b/xbuild/src/download.rs
@@ -187,7 +187,7 @@ impl WorkItem {
 impl WorkItem {
     const ORG: &'static str = "rust-mobile";
     const REPO: &'static str = "xbuild";
-    const VERSION: &'static str = "v0.1.0+3";
+    const VERSION: &'static str = "v0.2.1-alpha";
 
     pub fn xbuild_release(output: PathBuf, artifact: &str) -> Self {
         Self::github_release(output, Self::ORG, Self::REPO, Self::VERSION, artifact)

From e22ad1e2b9ce318d55e16ff7139a9dcd24bdcc84 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Mon, 6 Jan 2025 10:50:11 +0100
Subject: [PATCH 2/3] Switch from removed `macos-11` runners to `macos-latest`
 with Xcode 16.4

The `macos-11` runners are no longer hosted by GitHub as this OS version
is too old.  Likewise Xcode 13.2.1 is no longer available, the lowest
supported version appears to be `15.0`.
---
 .github/workflows/sdk.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index 28f4969..f68dae0 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -30,12 +30,12 @@ jobs:
         TAG: ${{ github.event.release.tag_name }}
 
   macos:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
     - run: ls /Applications/Xcode*
     - run: cp -R $SDK_PATH .
       env:
-        SDK_PATH: /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+        SDK_PATH: /Applications/Xcode_16.4.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
     - run: gtar --zstd -cf MacOSX.sdk.tar.zst MacOSX.sdk
     - run: gh release upload $TAG MacOSX.sdk.tar.zst -R ${{ github.repository }}
       env:
@@ -43,12 +43,12 @@ jobs:
         TAG: ${{ github.event.release.tag_name }}
 
   ios:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
     - run: ls /Applications/Xcode*
     - run: cp -R $SDK_PATH .
       env:
-        SDK_PATH: /Applications/Xcode_13.2.1.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk
+        SDK_PATH: /Applications/Xcode_16.4.0.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk
     - run: gtar --zstd -cf iPhoneOS.sdk.tar.zst iPhoneOS.sdk
     - run: gh release upload $TAG iPhoneOS.sdk.tar.zst -R ${{ github.repository }}
       env:

From 8dfedba25ce16641a33db03a18c7b6155409c7ab Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Fri, 15 Aug 2025 17:30:48 +0200
Subject: [PATCH 3/3] Force `macos-15` for Xcode 16.4

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

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
index f68dae0..3f230f6 100644
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -30,7 +30,7 @@ jobs:
         TAG: ${{ github.event.release.tag_name }}
 
   macos:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
     - run: ls /Applications/Xcode*
     - run: cp -R $SDK_PATH .
@@ -43,7 +43,7 @@ jobs:
         TAG: ${{ github.event.release.tag_name }}
 
   ios:
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
     - run: ls /Applications/Xcode*
     - run: cp -R $SDK_PATH .