From 3b0e00a8734e4ff8268ed3cb8d5bd8b246fae9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Mon, 6 May 2024 12:23:48 +0100 Subject: [PATCH 1/3] Ensure tag is updated --- docs/release.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release.md b/docs/release.md index 1f1bdb1b..f0b7df0f 100644 --- 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/ From 217075d7df00751c95a0e2cefffebcd4ad8d8c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Mon, 6 May 2024 12:24:44 +0100 Subject: [PATCH 2/3] Move versioning to file --- android/app/range/build.gradle | 4 ---- android/app/range/version.properties | 3 +++ docs/release.md | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 android/app/range/version.properties diff --git a/android/app/range/build.gradle b/android/app/range/build.gradle index 5d4b9d5c..2cafa915 100644 --- 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 new file mode 100644 index 00000000..f8b6d0b5 --- /dev/null +++ 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 index f0b7df0f..5b306e5c 100644 --- a/docs/release.md +++ b/docs/release.md @@ -16,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 @@ -56,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`. From 6f14a420eb7c8ef1e2e3934d482aedddf996a9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Mon, 6 May 2024 12:34:44 +0100 Subject: [PATCH 3/3] Remove versioning workaround https://github.com/TWiStErRob/net.twisterrob.gradle/issues/511 is already fixed --- .../groovy/net.twisterrob.blt.convention.gradle | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gradle/plugins/src/main/groovy/net.twisterrob.blt.convention.gradle b/gradle/plugins/src/main/groovy/net.twisterrob.blt.convention.gradle index 677ffad6..0a365293 100644 --- 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() } - }) - } -}