Allow applicationId from CI config.

Christiaan de Die le Clercq · Christiaan de Die le Clercq · commit 95ae12e18d16 · 2020-08-28T14:10:32.000+02:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'nl.uncinc.androidci:UncIncAndroidCI:0.2'
+        classpath 'nl.uncinc.androidci:UncIncAndroidCI:0.3'
     }
 }
 ```
@@ -27,13 +27,14 @@ apply plugin: 'nl.uncinc.androidci'
 ```
 android {
     defaultConfig {
-        versionCode project.ext.androidciconfig.getVersionCode()
-        versionName project.ext.androidciconfig.getVersionName()
+        applicationId project.ext.androidci.getApplicationId("nl.uncinc.demo")
+        versionCode project.ext.androidci.getVersionCode()
+        versionName project.ext.androidci.getVersionName()
     }
 
     buildTypes {
         release {
-            signingConfig project.ext.androidciconfig.getSigningConfig(project)
+            signingConfig project.ext.androidci.getSigningConfig()
         }
     }
 }
@@ -51,11 +52,12 @@ storeFile=/Full/Path/To/keystore.jks
 ```
 
 # Possible properties
-| Property                    | Purpose                                                                          | Default Value                                                                  |
-|-----------------------------|----------------------------------------------------------------------------------|--------------------------------------------------------------------------------|
-| androidci.signingProperties | Full path to the file with the signing configuration. Should be available to CI. | android-app-signing.properties (and if it does not exist. The Debug build key) |
-| androidci.versionCode       | Android versionCode, use an Integer value                                        | 1                                                                              |
-| androidci.versionName       | Android versionName, should be a String                                          | Git hash of the repo                                                           |
+| Property                    | Purpose                                                                            | Default Value                                                                  |
+|-----------------------------|------------------------------------------------------------------------------------|--------------------------------------------------------------------------------|
+| androidci.signingProperties | Full path to the file with the signing configuration. Should be available to CI.   | android-app-signing.properties (and if it does not exist. The Debug build key) |
+| androidci.versionCode       | Android versionCode, use an Integer value                                          | 1                                                                              |
+| androidci.versionName       | Android versionName, should be a String                                            | Git hash of the repo                                                           |
+| androidci.applicationId     | Override for application identifier, for multiple app flavours (e.g. Beta release) | Parameter given in the android defaultConfig                                   |        
 
 # License 
 MIT License
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'nl.uncinc.androidci'
-version '0.2'
+version '0.3'
 sourceCompatibility = 1.8
 
 repositories {
diff --git a/src/main/groovy/nl/uncinc/androidci/UncIncAndroidCIPlugin.groovy b/src/main/groovy/nl/uncinc/androidci/UncIncAndroidCIPlugin.groovy
@@ -7,12 +7,18 @@ import org.gradle.api.Project
 
 class UncIncAndroidCIPlugin implements Plugin<Project> {
     def androidci = new Properties()
+    Project project
 
     void apply(Project project) {
+        this.project = project
+
+        androidci.signingProperies = project.hasProperty('androidci.signingProperties')
+                ? project.getProperty('androidci.signingProperties') : 'android-app-signing.properties'
+        androidci.versionCode = project.hasProperty('androidci.versionCode')
+                ? project.getProperty('androidci.versionCode') as Integer : 1
+        androidci.versionName = project.hasProperty('androidci.versionName')
+                ? project.getProperty('androidci.versionName') : getGitHash()
 
-        androidci.signingProperies = project.hasProperty('androidci.signingProperties') ? project.getProperty('androidci.signingProperties') : 'android-app-signing.properties'
-        androidci.versionCode = project.hasProperty('androidci.versionCode') ? project.getProperty('androidci.versionCode') as Integer : 1
-        androidci.versionName = project.hasProperty('androidci.versionName') ? project.getProperty('androidci.versionName') : getGitHash(project)
         def keystoreProperties = new Properties()
 
         if (project.file(androidci.signingProperies).exists()) {
@@ -23,7 +29,8 @@ class UncIncAndroidCIPlugin implements Plugin<Project> {
                 keystoreProperties.setProperty("storeFileType", 'jks')
             }
         } else {
-            project.logger.error("No release build via CI currently or signing properties file not found. Defaulting to debug keystore for CI configuration.")
+            project.logger.error("No release build via CI currently or signing properties file not found." +
+                    " Defaulting to debug keystore for CI configuration.")
             keystoreProperties.setProperty("keyAlias", 'androiddebugkey')
             keystoreProperties.setProperty("keyPassword", 'android')
             keystoreProperties.setProperty("storePassword", 'android')
@@ -32,26 +39,35 @@ class UncIncAndroidCIPlugin implements Plugin<Project> {
 
         }
         androidci.keystoreProperties = keystoreProperties
-        project.ext.androidciconfig = this
+
+        // Expose this class to the project
+        project.ext.androidci = this
 
         project.task('printAndroidCIVars') {
             doLast {
                 println 'Signing: ' + androidci.signingProperies
                 println 'versionCode: ' + androidci.versionCode
                 println 'versionName: ' + androidci.versionName
+                println 'androidApplicationId': + androidci.applicationId
             }
         }
     }
 
     Integer getVersionCode() {
-        return androidci.versionCode
+        return androidci.versionCode as Integer
     }
 
     String getVersionName() {
         return androidci.versionName
     }
 
-    SigningConfig getSigningConfig(Project project) {
+    String getApplicationId(String appId) {
+        androidci.applicationId = project.hasProperty('androidci.applicationId')
+                ? project.getProperty('androidci.applicationId') : appId
+        return androidci.applicationId
+    }
+
+    SigningConfig getSigningConfig() {
         def signingConfig = new SigningConfig("CIStore")
         signingConfig.storeFile = project.file(androidci.keystoreProperties['storeFile'])
         signingConfig.storePassword = androidci.keystoreProperties['storePassword']
@@ -60,7 +76,7 @@ class UncIncAndroidCIPlugin implements Plugin<Project> {
         return signingConfig
     }
 
-    String getGitHash(Project project) {
+    String getGitHash() {
             def stdout = new ByteArrayOutputStream()
             project.exec {
                 commandLine 'git', 'rev-parse', '--short', 'HEAD'

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`dependencies {`
`18`		`- classpath 'nl.uncinc.androidci:UncIncAndroidCI:0.2'`
	`18`	`+ classpath 'nl.uncinc.androidci:UncIncAndroidCI:0.3'`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	```
`@@ -27,13 +27,14 @@ apply plugin: 'nl.uncinc.androidci'`
`27`	`27`	```
`28`	`28`	`android {`
`29`	`29`	`defaultConfig {`
`30`		`- versionCode project.ext.androidciconfig.getVersionCode()`
`31`		`- versionName project.ext.androidciconfig.getVersionName()`
	`30`	`+ applicationId project.ext.androidci.getApplicationId("nl.uncinc.demo")`
	`31`	`+ versionCode project.ext.androidci.getVersionCode()`
	`32`	`+ versionName project.ext.androidci.getVersionName()`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`buildTypes {`
`35`	`36`	`release {`
`36`		`- signingConfig project.ext.androidciconfig.getSigningConfig(project)`
	`37`	`+ signingConfig project.ext.androidci.getSigningConfig()`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`	`}`
`@@ -51,11 +52,12 @@ storeFile=/Full/Path/To/keystore.jks`
`51`	`52`	```
`52`	`53`
`53`	`54`	`# Possible properties`
`54`		`-\| Property \| Purpose \| Default Value \|`
`55`		`-\|-----------------------------\|----------------------------------------------------------------------------------\|--------------------------------------------------------------------------------\|`
`56`		`-\| androidci.signingProperties \| Full path to the file with the signing configuration. Should be available to CI. \| android-app-signing.properties (and if it does not exist. The Debug build key) \|`
`57`		`-\| androidci.versionCode \| Android versionCode, use an Integer value \| 1 \|`
`58`		`-\| androidci.versionName \| Android versionName, should be a String \| Git hash of the repo \|`
	`55`	`+\| Property \| Purpose \| Default Value \|`
	`56`	`+\|-----------------------------\|------------------------------------------------------------------------------------\|--------------------------------------------------------------------------------\|`
	`57`	`+\| androidci.signingProperties \| Full path to the file with the signing configuration. Should be available to CI. \| android-app-signing.properties (and if it does not exist. The Debug build key) \|`
	`58`	`+\| androidci.versionCode \| Android versionCode, use an Integer value \| 1 \|`
	`59`	`+\| androidci.versionName \| Android versionName, should be a String \| Git hash of the repo \|`
	`60`	`+\| androidci.applicationId \| Override for application identifier, for multiple app flavours (e.g. Beta release) \| Parameter given in the android defaultConfig \|`
`59`	`61`
`60`	`62`	`# License`
`61`	`63`	`MIT License`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`group 'nl.uncinc.androidci'`
`8`		`-version '0.2'`
	`8`	`+version '0.3'`
`9`	`9`	`sourceCompatibility = 1.8`
`10`	`10`
`11`	`11`	`repositories {`