Skip to content

Native Android client for Spotify, built with Jetpack Compose

Release APKs: the clear names only, no copies under the 2.3 names

kota-zod26072bfbe52
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 4f524007..11107530 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -113,13 +113,10 @@ jobs:
# One build, every APK (ABI splits), same versionCode, named by :app:collectApks:
# Myspoti-2.4.0-ARMv8.apk, -ARMv7.apk, -universal.apk, -TV.apk (betas: Myspoti-Beta-...).
# The app's update check picks this phone's one (UpdateChecker.apkAsset).
- # -PlegacyNames: also myspoti-<beta|stable>-<version>-<abi>.apk, the only names the
- # updater of 2.3.x and earlier (and Obtainium filters set up for them) know.
./gradlew assembleRelease :app:collectApks \
-PappVersionName="$VERSION" \
-PappVersionCode="$((1000 + GITHUB_RUN_NUMBER))" \
- -PupdateRepo="$GITHUB_REPOSITORY" \
- -PlegacyNames
+ -PupdateRepo="$GITHUB_REPOSITORY"
# This version's section of CHANGELOG.md becomes the release description.
- name: Release notes
diff --git a/README.md b/README.md
index f48e71fb..6451fb37 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Each release carries four APKs:
- `Myspoti-<version>-universal.apk`: both in one, larger.
- `Myspoti-<version>-TV.apk`: Android TV and Google TV (the same app; on a TV it opens its TV screens).
-Betas are `Myspoti-Beta-<version>-...`. The in-app update picks the right one by itself. (The `myspoti-stable-…-arm64-v8a.apk` copies are there for the updater of 2.3 and earlier.)
+Betas are `Myspoti-Beta-<version>-...`. The in-app update picks the right one by itself.
Obtainium (add `https://github.com/kota-zo/myspoti`; the stable app and the beta app are two apps):
- **Stable** (`app.myspoti.stable`): leave "Include prereleases" off and set the APK filter to `^Myspoti-[0-9].*-ARMv8\.apk$` (or `-ARMv7`, `-TV`).
diff --git a/base/app/build.gradle.kts b/base/app/build.gradle.kts
index 67fb1afd..9d2b7c80 100644
--- a/base/app/build.gradle.kts
+++ b/base/app/build.gradle.kts
@@ -196,15 +196,12 @@ dependencies {
* Myspoti-2.4.0-ARMv7.apk (32-bit), Myspoti-2.4.0-universal.apk (both) and Myspoti-2.4.0-TV.apk
* (Android TV: the universal APK, since many TVs run 32-bit apps on a 64-bit chip). Betas are
* Myspoti-Beta-..., the optimised dev builds Myspoti-dev-...
- * -PlegacyNames: also the names the updater of 2.3.x and earlier looks for
- * (myspoti-<beta|stable>-<version>-<abi>.apk), so those apps still find their update.
*/
tasks.register("collectApks") {
mustRunAfter("assembleRelease")
val version = (findProperty("appVersionName") as String?) ?: "2.3.0"
val beta = findProperty("appVersionName") == null || version.contains("-beta")
val app = when { findProperty("overDev") != null -> "Myspoti-dev"; beta -> "Myspoti-Beta"; else -> "Myspoti" }
- val legacy = findProperty("legacyNames") != null
// Copies: the configuration cache cannot keep a reference to the script's own values.
val abis = RELEASE_ABIS.toList()
val abiNames = ABI_NAMES.toMap()
@@ -220,7 +217,6 @@ tasks.register("collectApks") {
}
abis.forEach { abi ->
copy("app-$abi-release.apk", "$app-$version-${abiNames.getValue(abi)}.apk")
- if (legacy) copy("app-$abi-release.apk", "myspoti-${if (beta) "beta" else "stable"}-$version-$abi.apk")
}
copy("app-universal-release.apk", "$app-$version-universal.apk")
copy("app-universal-release.apk", "$app-$version-TV.apk")
diff --git a/base/app/src/main/java/com/music/spotui/data/api/UpdateChecker.kt b/base/app/src/main/java/com/music/spotui/data/api/UpdateChecker.kt
index 0fe998ea..438b80c9 100644
--- a/base/app/src/main/java/com/music/spotui/data/api/UpdateChecker.kt
+++ b/base/app/src/main/java/com/music/spotui/data/api/UpdateChecker.kt
@@ -127,8 +127,7 @@ object UpdateChecker {
* `Myspoti-<version>-ARMv8.apk`, `-ARMv7.apk`, `-universal.apk` and `-TV.apk` (betas:
* `Myspoti-Beta-<version>-...`), and the first of [abis] (the phone's, most preferred first)
* that has one wins, so a 64-bit phone that also runs armeabi-v7a takes ARMv8. The names of
- * 2.3.x and before come next: `myspoti-<beta|stable>-<version>-<abi>.apk` (still uploaded for
- * the apps that only know them), then one APK without an ABI, `myspoti-<beta|stable>-<version>.apk`
+ * 2.3.x and before come next (older releases): `myspoti-<beta|stable>-<version>-<abi>.apk`, then one APK without an ABI, `myspoti-<beta|stable>-<version>.apk`
* or `myspoti-<version>.apk`. Only this channel's APK: a release carrying both must not hand a
* phone the other channel's build (a different package, it could not update this one), and a
* name that matches none (or no APK for this phone's ABIs) gives no link.