Fix version numbering for multi APK

andrew-codechimp · andrew-codechimp · commit 63012461bbdf · 2019-04-30T12:59:13.000+01:00
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -16,11 +16,13 @@ android {
 
         if (env.BUILD_NUMBER != null) {
             versionCode Integer.parseInt("50" + env.BUILD_NUMBER + "1")
+            versionCodeSuffix Integer.parseInt("50" + env.BUILD_NUMBER + "0")
         } else {
             versionCode Integer.parseInt(project.VERSION_CODE)
+            versionCodeSuffix Integer.parseInt(project.VERSION_CODE)
         }
 
-        versionName project.VERSION_NAME + "." + versionCode.toString()
+        versionName project.VERSION_NAME + "." + versionCodeSuffix.toString()
     }
 
     signingConfigs { release }
diff --git a/wear/build.gradle b/wear/build.gradle
@@ -19,11 +19,13 @@ android {
 
         if (env.BUILD_NUMBER != null) {
             versionCode Integer.parseInt("50" + env.BUILD_NUMBER + "2")
+            versionCodeSuffix Integer.parseInt("50" + env.BUILD_NUMBER + "0")
         } else {
             versionCode Integer.parseInt(project.VERSION_CODE + 1)
+            versionCodeSuffix Integer.parseInt(project.VERSION_CODE)
         }
 
-        versionName project.VERSION_NAME + "." + versionCode.toString()
+        versionName project.VERSION_NAME + "." + versionCodeSuffix.toString()
     }
 
     signingConfigs { release }

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,13 @@ android {`
`16`	`16`
`17`	`17`	`if (env.BUILD_NUMBER != null) {`
`18`	`18`	`versionCode Integer.parseInt("50" + env.BUILD_NUMBER + "1")`
	`19`	`+ versionCodeSuffix Integer.parseInt("50" + env.BUILD_NUMBER + "0")`
`19`	`20`	`} else {`
`20`	`21`	`versionCode Integer.parseInt(project.VERSION_CODE)`
	`22`	`+ versionCodeSuffix Integer.parseInt(project.VERSION_CODE)`
`21`	`23`	`}`
`22`	`24`
`23`		`- versionName project.VERSION_NAME + "." + versionCode.toString()`
	`25`	`+ versionName project.VERSION_NAME + "." + versionCodeSuffix.toString()`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`signingConfigs { release }`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,13 @@ android {`
`19`	`19`
`20`	`20`	`if (env.BUILD_NUMBER != null) {`
`21`	`21`	`versionCode Integer.parseInt("50" + env.BUILD_NUMBER + "2")`
	`22`	`+ versionCodeSuffix Integer.parseInt("50" + env.BUILD_NUMBER + "0")`
`22`	`23`	`} else {`
`23`	`24`	`versionCode Integer.parseInt(project.VERSION_CODE + 1)`
	`25`	`+ versionCodeSuffix Integer.parseInt(project.VERSION_CODE)`
`24`	`26`	`}`
`25`	`27`
`26`		`- versionName project.VERSION_NAME + "." + versionCode.toString()`
	`28`	`+ versionName project.VERSION_NAME + "." + versionCodeSuffix.toString()`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`signingConfigs { release }`