Fix Android release versioning (#186)

TWiStErRob · May 6, 2024 · 3510538 · 3510538
1 parent 95efc61
commit 3510538
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/android/app/range/build.gradle b/android/app/range/build.gradle
@@ -3,10 +3,6 @@ plugins {
 }
 
 android.defaultConfig.applicationId = "net.twisterrob.blt.range"
-android.defaultConfig.version {
-	major = 1
-	minor = 1
-}
 
 dependencies {
 	implementation(projects.android.component.android)

diff --git a/android/app/range/version.properties b/android/app/range/version.properties
@@ -0,0 +1,3 @@
+major=1
+minor=1
+patch=0
diff --git a/docs/release.md b/docs/release.md
@@ -6,6 +6,7 @@
 1. `gradlew :web:status-history:appengineDeploy`
 1. Verify new version is created in [Google Cloud Console][versions].
 1. Check [live][live] version is operational.
+1. `git tag -f live` on `main` and `git push -f live`.
 1. Clean up old versions in [Google Cloud Console][versions].
 
 [live]: https://twisterrob-london.appspot.com/
@@ -15,7 +16,7 @@
 
 For the full process see [.github/release.md][releasing].
 
-1. Double-check the version number in `android/app/range/build.gradle` is the same as the milestone, if not, PR.
+1. Double-check the version number in `android/app/range/version.properties` is the same as the milestone, if not, PR.
 1. Ensure clean latest working copy.
    ```shell
    git checkout main
@@ -55,4 +56,4 @@ For the full process see [.github/release.md][releasing].
 [pre-launch-report]: https://play.google.com/console/developers/7995455198986011414/app/4972239006863689375/pre-launch-report/overview
 
 ## Prepare next release
-1. Update version number in android/app/range/build.gradle anticipating minor and commit to `main`.
+1. Update version number in `android/app/range/version.properties` anticipating minor and PR to `main`.
diff --git a/gradle/plugins/src/main/groovy/net.twisterrob.blt.convention.gradle b/gradle/plugins/src/main/groovy/net.twisterrob.blt.convention.gradle
@@ -39,16 +39,3 @@ pluginManager.withPlugin("com.android.lint") {
 		enable += "StopShip"
 	}
 }
-
-if (project.gradle.startParameter.isConfigurationCacheRequested()) {
-	// TODEL https://github.com/TWiStErRob/net.twisterrob.gradle/issues/511
-	project.plugins.withId("com.android.application") {
-		project.VCS.setCurrent$twister_convention_versioning(new net.twisterrob.gradle.vcs.VCSExtension() {
-			@Override boolean isAvailableQuick() { return false }
-			@Override boolean isAvailable() { return isAvailableQuick() }
-			@Override String getRevision() { return "no VCS" }
-			@Override int getRevisionNumber() { return 0 }
-			@Override FileCollection files(Project project) { return project.files() }
-		})
-	}
-}
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    major=1
+    minor=1
+    patch=0