From f66fed302ad5fde6de1bdb6a59a4fdb5f10fba3f Mon Sep 17 00:00:00 2001 From: tageniu Date: Fri, 12 Jun 2026 22:38:52 -0400 Subject: [PATCH 1/5] Updates the ApplePackage dependency to 1.2.7 (auth endpoint move + 5002 redownload fallback) --- Asspp.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asspp.xcodeproj/project.pbxproj b/Asspp.xcodeproj/project.pbxproj index 3bdab27..3dd325a 100644 --- a/Asspp.xcodeproj/project.pbxproj +++ b/Asspp.xcodeproj/project.pbxproj @@ -409,7 +409,7 @@ repositoryURL = "https://github.com/Lakr233/ApplePackage"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 1.2.3; + minimumVersion = 1.2.7; }; }; 50ABFE1D2F48AAE50077DE1A /* XCRemoteSwiftPackageReference "ButtonKit" */ = { From 8a40ba6830c0e904f50a8a50d7bfaa58196cae55 Mon Sep 17 00:00:00 2001 From: tageniu Date: Fri, 12 Jun 2026 22:51:15 -0400 Subject: [PATCH 2/5] build CI: select the newest non-beta Xcode dynamically --- .github/workflows/build.yml | 61 ++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d5d0324..5444240 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,36 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Select Xcode 26 - run: sudo xcode-select -s /Applications/Xcode_26.0.app + - name: Select newest non-beta Xcode + run: | + set -euo pipefail + best_path="" + best_ver="" + for app in /Applications/Xcode*.app; do + [ -d "$app" ] || continue + info="$app/Contents/Info.plist" + [ -f "$info" ] || continue + # Skip beta/release-candidate installs. + case "$(printf '%s' "$app" | tr '[:upper:]' '[:lower:]')" in + *beta*|*_rc*) continue ;; + esac + ver="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "$info" 2>/dev/null || true)" + [ -n "$ver" ] || continue + if [ -z "$best_ver" ] || [ "$(printf '%s\n%s\n' "$best_ver" "$ver" | sort -V | tail -1)" = "$ver" ]; then + best_ver="$ver" + best_path="$app" + fi + done + if [ -z "$best_path" ]; then + echo "::error::No non-beta Xcode found" + exit 1 + fi + echo "Selected Xcode $best_ver at $best_path" + sudo xcode-select -s "$best_path" + xcodebuild -version + + - name: Ensure iOS platform is installed + run: xcodebuild -downloadPlatform iOS || true - name: Install Procursus uses: dhinakg/procursus-action@main @@ -40,8 +68,33 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Select Xcode 26 - run: sudo xcode-select -s /Applications/Xcode_26.0.app + - name: Select newest non-beta Xcode + run: | + set -euo pipefail + best_path="" + best_ver="" + for app in /Applications/Xcode*.app; do + [ -d "$app" ] || continue + info="$app/Contents/Info.plist" + [ -f "$info" ] || continue + # Skip beta/release-candidate installs. + case "$(printf '%s' "$app" | tr '[:upper:]' '[:lower:]')" in + *beta*|*_rc*) continue ;; + esac + ver="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "$info" 2>/dev/null || true)" + [ -n "$ver" ] || continue + if [ -z "$best_ver" ] || [ "$(printf '%s\n%s\n' "$best_ver" "$ver" | sort -V | tail -1)" = "$ver" ]; then + best_ver="$ver" + best_path="$app" + fi + done + if [ -z "$best_path" ]; then + echo "::error::No non-beta Xcode found" + exit 1 + fi + echo "Selected Xcode $best_ver at $best_path" + sudo xcode-select -s "$best_path" + xcodebuild -version - name: Install Procursus uses: dhinakg/procursus-action@main From d3b0f9dc756d98c12f8ee7628629b63b52dd182a Mon Sep 17 00:00:00 2001 From: Shijie Sun Date: Fri, 12 Jun 2026 23:30:23 -0400 Subject: [PATCH 3/5] Fix macOS --- .../xcshareddata/swiftpm/Package.resolved | 15 ++++++++++++--- Asspp/Interface/Search/SearchView.swift | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Asspp.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Asspp.xcworkspace/xcshareddata/swiftpm/Package.resolved index bccb620..db35b2e 100644 --- a/Asspp.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Asspp.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "7c78253d2c10449c714d18337097e74f58beff98cb7c463ed11e4f0debbbbb72", + "originHash" : "1a820beefc59d37b8100e5a7b0793cbbef9e6ba816060518e50d45dbaa8749eb", "pins" : [ { "identity" : "anycodable", @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Lakr233/ApplePackage", "state" : { - "revision" : "fd4860b78eb2db60a0dcbe7e5a6e4a3d2cae004e", - "version" : "1.2.3" + "revision" : "28710fec47fa89dfdedf2bf47cc284a2334ddfdc", + "version" : "1.2.7" } }, { @@ -154,6 +154,15 @@ "version" : "1.2.1" } }, + { + "identity" : "swift-argument-parser", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-argument-parser", + "state" : { + "revision" : "6a52f3251125d74daf04fcbd5e6f08a75d074382", + "version" : "1.8.2" + } + }, { "identity" : "swift-asn1", "kind" : "remoteSourceControl", diff --git a/Asspp/Interface/Search/SearchView.swift b/Asspp/Interface/Search/SearchView.swift index c4c06a9..ecf6eca 100644 --- a/Asspp/Interface/Search/SearchView.swift +++ b/Asspp/Interface/Search/SearchView.swift @@ -298,6 +298,8 @@ extension ApplePackage.EntityType { "iphone" case .iPad: "ipad" + case .appleTV: + "appleTV" } } } From 85491b64719df0557094e50db48b42dd3de00cff Mon Sep 17 00:00:00 2001 From: tageniu Date: Fri, 12 Jun 2026 23:41:11 -0400 Subject: [PATCH 4/5] Bump 4.1.2 --- Configuration/Version.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index b4c300d..0d83312 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -2,5 +2,5 @@ // Single source of truth for version numbers // CI can modify this file to update version for all configurations -MARKETING_VERSION = 4.1.1 +MARKETING_VERSION = 4.1.2 CURRENT_PROJECT_VERSION = 0 From 991c5c1984bc2f280b5f795783ad7b02cbaacb97 Mon Sep 17 00:00:00 2001 From: tageniu Date: Fri, 12 Jun 2026 23:47:30 -0400 Subject: [PATCH 5/5] Revert to select Xcode 26.0 --- .github/workflows/build.yml | 58 +++---------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5444240..8dac1a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,33 +14,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Select newest non-beta Xcode - run: | - set -euo pipefail - best_path="" - best_ver="" - for app in /Applications/Xcode*.app; do - [ -d "$app" ] || continue - info="$app/Contents/Info.plist" - [ -f "$info" ] || continue - # Skip beta/release-candidate installs. - case "$(printf '%s' "$app" | tr '[:upper:]' '[:lower:]')" in - *beta*|*_rc*) continue ;; - esac - ver="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "$info" 2>/dev/null || true)" - [ -n "$ver" ] || continue - if [ -z "$best_ver" ] || [ "$(printf '%s\n%s\n' "$best_ver" "$ver" | sort -V | tail -1)" = "$ver" ]; then - best_ver="$ver" - best_path="$app" - fi - done - if [ -z "$best_path" ]; then - echo "::error::No non-beta Xcode found" - exit 1 - fi - echo "Selected Xcode $best_ver at $best_path" - sudo xcode-select -s "$best_path" - xcodebuild -version + - name: Select Xcode 26 + run: sudo xcode-select -s /Applications/Xcode_26.0.app - name: Ensure iOS platform is installed run: xcodebuild -downloadPlatform iOS || true @@ -68,33 +43,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Select newest non-beta Xcode - run: | - set -euo pipefail - best_path="" - best_ver="" - for app in /Applications/Xcode*.app; do - [ -d "$app" ] || continue - info="$app/Contents/Info.plist" - [ -f "$info" ] || continue - # Skip beta/release-candidate installs. - case "$(printf '%s' "$app" | tr '[:upper:]' '[:lower:]')" in - *beta*|*_rc*) continue ;; - esac - ver="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' "$info" 2>/dev/null || true)" - [ -n "$ver" ] || continue - if [ -z "$best_ver" ] || [ "$(printf '%s\n%s\n' "$best_ver" "$ver" | sort -V | tail -1)" = "$ver" ]; then - best_ver="$ver" - best_path="$app" - fi - done - if [ -z "$best_path" ]; then - echo "::error::No non-beta Xcode found" - exit 1 - fi - echo "Selected Xcode $best_ver at $best_path" - sudo xcode-select -s "$best_path" - xcodebuild -version + - name: Select Xcode 26 + run: sudo xcode-select -s /Applications/Xcode_26.0.app - name: Install Procursus uses: dhinakg/procursus-action@main