Automatic version bumping #96

hhio618 · 2022-05-20T19:43:28Z

Description

closes #94

Tasks

Ensure clean repo and bumping a release (using either type or version parameters) and commit the changes and prepare for the next development cycle:

$ ./gradlew releasePrepare [-PbumpType=(major|minor|patch)] [-PbumpVersion=x.y.z]

Push the changes to git using the Gradle-git plugin:

$ ./gradlew releasePerform

build.gradle

nya-elimu

@hhio618 Thank you, this is really cool to see!

I tried running ./gradlew releasePrepare, and got "unspecified" as the new versionName:

Bumping versionName from 1.1.4 to unspecified
Bumping versionCode from 1001004 to 1001005

Would it be possible to set the versionName as well?

hhio618 · 2022-05-21T14:29:51Z

Thanks, @nya-elimuai. you need to specify either bumpType or bumpVersion parameters to get this to work:
Example:

./gradlew releasePrepare -PbumpType=patch # will increase the patch number, choices=major,minor,patch

./gradlew releasePrepare -PbumpVersion=x.y.z # bump to a specific version.

I added an exception to prompt for either of these parameters.

nya-elimu · 2022-05-27T11:52:50Z

app/build.gradle

-            newVersionName = project.properties["version"]
-        }else {
+        print project.properties.containsKey("bumpVersion")
+        if (project.properties.containsKey("bumpVersion")){


Add missing whitespace: ) {

nya-elimu · 2022-05-27T12:11:11Z

#96 (comment)

@hhio618 This is really cool! Tested with ./gradlew releasePrepare -PbumpType=patch:

nya-elimu

@hhio618 This is really great! Amazing work 👏🏽

I only have one final adjustment, when running ./gradlew releasePrepare -PbumpType=patch: Instead of bumping the version before the release, bump it after the release. That way it would work the same as with the webapp release versioning.

Example: If the version looks like this before the release:

versionCode 1001005
versionName '1.1.5-SNAPSHOT'

change it to

versionCode 1001005
versionName '1.1.5'

Then release (commit to Git).

And then (after the release), bump the version for the next iteration:

versionCode 1001006
versionName '1.1.6-SNAPSHOT'

nya-elimu · 2022-05-27T11:53:23Z

app/build.gradle

-        if (project.properties.containsKey("version")){
-            newVersionName = project.properties["version"]
-        }else {
+        print project.properties.containsKey("bumpVersion")


Include a text that explains the printout (to know where in the code the log output comes from)

nya-elimu · 2022-05-27T11:53:38Z

app/build.gradle

+        print project.properties.containsKey("bumpVersion")
+        if (project.properties.containsKey("bumpVersion")){
+            newVersionName = project.properties["bumpVersion"]
+        }else if (project.properties.containsKey("bumpType")) {


Add missing whitespace: } else

nya-elimu · 2022-05-27T11:54:06Z

app/build.gradle

@@ -103,6 +104,8 @@ task releasePrepare(dependsOn: releaseClean) {
                    break
            }
            newVersionName = "$major.$minor.$patch"
+        }else{


Add missing whitespace: } else {

hhio618 · 2022-05-27T17:56:52Z

@nya-elimuai Thanks for the review! I made the changes you mentioned.

nya-elimu

Thank you, @hhio618!

Now ./gradlew releasePrepare -PbumpType=patch worked perfectly:

Bumping versionName from 1.1.4 to 1.1.5
Bumping versionCode from 1001004 to 1001005

c028067
b75c052

However, ./gradlew releasePerform failed:

./gradlew releasePerform                 

Task 'releasePerform' not found in root project 'Vitabu'.

Am I using ./gradlew releasePerform correctly?

hhio618 · 2022-06-02T16:21:32Z

@nya-elimuai Fixed, I also updated the releaseClean task to rollback/clean git commit history before calling the releasePrepare task.

nya-elimu · 2022-06-03T04:30:09Z

app/build.gradle

        }
    }
 }
+task releaseClean(dependsOn: ensureCleanRepo) {
+    doLast {
+        def Clean = true


Make Clean lower-case: clean

nya-elimu · 2022-06-03T04:32:04Z

app/build.gradle

+        while (headCommitMessage.contains("[gradle-release-task]")) {
+            Clean = false
+            println "Found git commit: $headCommitMessage"
+            if (headCommitMessage.indexOf("vitabu-") > -1) {


To make the solution scalable to other Android apps (with different names, can you change "vitabu-" into a variable? For example by using the applicationId variable instead?

Would require adjusting the string used in grgit.commit(): "prepare release ${applicationId}-"

nya-elimu · 2022-06-03T04:32:23Z

app/build.gradle

+            Clean = false
+            println "Found git commit: $headCommitMessage"
+            if (headCommitMessage.indexOf("vitabu-") > -1) {
+                def tagName = headCommitMessage.split("vitabu-")[1]


Same comment here as above.

nya-elimu · 2022-06-03T04:32:43Z

app/build.gradle

+            headCommitMessage = grgit.head().shortMessage
+
+        }
+        if (Clean){


Change to if (clean) {

nya-elimu

Looks great! Only added a suggestion to use the applicationId variable.

nya-elimu

Looks good. Thank you!

add gradle tasks for automatic version bumping

27e00e9

hhio618 requested a review from a team as a code owner May 20, 2022 19:43

fix releaseClean task

570da6b

nya-elimu reviewed May 21, 2022

View reviewed changes

build.gradle Outdated Show resolved Hide resolved

nya-elimu requested changes May 21, 2022

View reviewed changes

set grgit classpath version

086d404

hhio618 force-pushed the hhio618/dw-223/vitabu-automate-bumping branch from 3374122 to 086d404 Compare May 21, 2022 13:45

check task params

8c66e94

nya-elimu reviewed May 27, 2022

View reviewed changes

nya-elimu requested changes May 27, 2022

View reviewed changes

small fixes

baceb0e

hhio618 force-pushed the hhio618/dw-223/vitabu-automate-bumping branch from 32bdd85 to baceb0e Compare May 27, 2022 17:55

hhio618 requested a review from nya-elimu May 28, 2022 13:25

nya-elimu requested changes Jun 1, 2022

View reviewed changes

hhio618 force-pushed the hhio618/dw-223/vitabu-automate-bumping branch 3 times, most recently from 32f7881 to 7d42b5e Compare June 2, 2022 16:08

hhio618 added 2 commits June 2, 2022 20:39

Clean git history, fix typo

65998e2

push tags on release

801a406

hhio618 force-pushed the hhio618/dw-223/vitabu-automate-bumping branch from 7d42b5e to 801a406 Compare June 2, 2022 16:16

nya-elimu reviewed Jun 3, 2022

View reviewed changes

app/build.gradle Outdated

headCommitMessage = grgit.head().shortMessage

}

if (Clean){

Copy link

Member

nya-elimu Jun 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to if (clean) {

nya-elimu requested changes Jun 3, 2022

View reviewed changes

Update release commit message

6bfd05c

hhio618 force-pushed the hhio618/dw-223/vitabu-automate-bumping branch from 9656e87 to 6bfd05c Compare June 4, 2022 07:13

hhio618 requested a review from nya-elimu June 4, 2022 07:52

nya-elimu approved these changes Jun 4, 2022

View reviewed changes

Merge branch 'main' into hhio618/dw-223/vitabu-automate-bumping

d76a921

nya-elimu mentioned this pull request Aug 21, 2022

Automate APK signing with Gradle script #92

Open

7 tasks

hhio618 merged commit ad38f50 into elimu-ai:main Sep 19, 2022

nya-elimu mentioned this pull request Sep 26, 2022

Automate Gradle releases for Android apps elimu-ai/wiki#130

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Automatic version bumping #96

Automatic version bumping #96

hhio618 commented May 20, 2022 •

edited

Loading

nya-elimu left a comment •

edited

Loading

hhio618 commented May 21, 2022

nya-elimu May 27, 2022

nya-elimu commented May 27, 2022

nya-elimu left a comment

nya-elimu May 27, 2022

nya-elimu May 27, 2022

nya-elimu May 27, 2022

hhio618 commented May 27, 2022

nya-elimu left a comment

hhio618 commented Jun 2, 2022

nya-elimu Jun 3, 2022

nya-elimu Jun 3, 2022 •

edited

Loading

nya-elimu Jun 3, 2022

nya-elimu Jun 3, 2022

nya-elimu left a comment

nya-elimu left a comment

Automatic version bumping #96

Automatic version bumping #96

Conversation

hhio618 commented May 20, 2022 • edited Loading

Description

Tasks

nya-elimu left a comment • edited Loading

Choose a reason for hiding this comment

hhio618 commented May 21, 2022

nya-elimu May 27, 2022

Choose a reason for hiding this comment

nya-elimu commented May 27, 2022

nya-elimu left a comment

Choose a reason for hiding this comment

nya-elimu May 27, 2022

Choose a reason for hiding this comment

nya-elimu May 27, 2022

Choose a reason for hiding this comment

nya-elimu May 27, 2022

Choose a reason for hiding this comment

hhio618 commented May 27, 2022

nya-elimu left a comment

Choose a reason for hiding this comment

hhio618 commented Jun 2, 2022

nya-elimu Jun 3, 2022

Choose a reason for hiding this comment

nya-elimu Jun 3, 2022 • edited Loading

Choose a reason for hiding this comment

nya-elimu Jun 3, 2022

Choose a reason for hiding this comment

nya-elimu Jun 3, 2022

Choose a reason for hiding this comment

nya-elimu left a comment

Choose a reason for hiding this comment

nya-elimu left a comment

Choose a reason for hiding this comment

hhio618 commented May 20, 2022 •

edited

Loading

nya-elimu left a comment •

edited

Loading

nya-elimu Jun 3, 2022 •

edited

Loading