Release version 0.9.3 with automated generation of versionCode and ve…

…rsionName
fmeum · Dec 7, 2019 · 8b1c48a · 8b1c48a
1 parent 31980c7
commit 8b1c48a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/authenticator/build.gradle b/authenticator/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "me.henneke.wearauthn.authenticator"
         minSdkVersion 28
         targetSdkVersion 29
-        versionCode 228092
-        versionName "0.9.2"
+        versionCode makeVersionCode(minSdkVersion.apiLevel, true)
+        versionName makeVersionName()
     }
     buildTypes {
         release {

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
+ext.versionMajor = 0
+ext.versionMinor = 9
+ext.versionPatch = 3
+
 buildscript {
     ext.kotlin_version = '1.3.61'
     repositories {
@@ -23,6 +27,22 @@ allprojects {
     }
 }
 
+private Integer makeVersionCode(int minSdkVersion, boolean wear) {
+    long version = minSdkVersion * 1000000 +
+            ext.versionMajor * 10000 +
+            ext.versionMinor * 100 +
+            ext.versionPatch
+    if (wear) {
+        return 100000000 + version
+    } else {
+        return version
+    }
+}
+
+private String makeVersionName() {
+    return "${ext.versionMajor}.${ext.versionMinor}.${ext.versionPatch}"
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/companion/build.gradle b/companion/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "me.henneke.wearauthn.authenticator"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 129092
-        versionName "0.9.2"
+        versionCode makeVersionCode(minSdkVersion.apiLevel, false)
+        versionName makeVersionName()
     }
     signingConfigs {
         testSign {

diff --git a/companion/src/main/res/values/strings.xml b/companion/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">WearAuthn</string>
-    <string name="changelog"><![CDATA[<h4>Recent changes</h4><b>Version 0.9.2</b><br/>• Fix a crash when the NFC state changes<br/><br/><b>Version 0.9.1</b><br/>• Verify master key signatures in constant time]]></string>
+    <string name="changelog"><![CDATA[<h4>Recent changes</h4><b>Version 0.9.3</b><br/>• Updated Android libraries<br/>• Fix the visibility of the NFC settings icon<br/><br/><b>Version 0.9.2</b><br/>• Fix a crash when the NFC state changes<br/><br/><b>Version 0.9.1</b><br/>• Verify master key signatures in constant time]]></string>
     <string name="url_new_issue">https://github.com/FabianHenneke/WearAuthn/issues/new?assignees=FabianHenneke&amp;template=bug_report.md</string>
     <string name="label_purchase_button_purchased">Purchased</string>
     <string name="label_purchase_button_pending">Purchase pending</string>