build: inline versionCode and versionName at destination

msfjarvis · msfjarvis · commit 3d0850fa1ff8 · 2020-04-21T18:39:01.000+05:30
Signed-off-by: Harsh Shandilya &lt;me@msfjarvis.dev&gt;
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ android {
     if (isSnapshot()) {
         android.applicationVariants.all { final variant ->
             variant.outputs.all {
-                outputFileName = "aps_${versions.versionName}.apk"
+                outputFileName = "aps_${defaultConfig.versionName}.apk"
             }
         }
     }
@@ -35,6 +35,8 @@ android {
 
     defaultConfig {
         applicationId versions.packageName
+        versionCode 10601
+        versionName '1.7.0-SNAPSHOT'
     }
 
     lintOptions {
diff --git a/build.gradle b/build.gradle
@@ -48,9 +48,6 @@ subprojects {
         defaultConfig {
             minSdkVersion versions.minSdk
             targetSdkVersion versions.targetSdk
-            versionCode versions.versionCode
-            versionName versions.versionName
-
             testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         }
         compileOptions {
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -6,8 +6,6 @@ ext.versions = [
     minSdk: 23,
     targetSdk: 29,
     compileSdk: 29,
-    versionCode: 10601,
-    versionName: '1.7.0-SNAPSHOT',
     buildTools: '29.0.3',
     packageName: 'dev.msfjarvis.aps'
 ]

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ android {`
`26`	`26`	`if (isSnapshot()) {`
`27`	`27`	`android.applicationVariants.all { final variant ->`
`28`	`28`	`variant.outputs.all {`
`29`		`- outputFileName = "aps_${versions.versionName}.apk"`
	`29`	`+ outputFileName = "aps_${defaultConfig.versionName}.apk"`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
`@@ -35,6 +35,8 @@ android {`
`35`	`35`
`36`	`36`	`defaultConfig {`
`37`	`37`	`applicationId versions.packageName`
	`38`	`+ versionCode 10601`
	`39`	`+ versionName '1.7.0-SNAPSHOT'`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`lintOptions {`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,6 @@ ext.versions = [`
`6`	`6`	`minSdk: 23,`
`7`	`7`	`targetSdk: 29,`
`8`	`8`	`compileSdk: 29,`
`9`		`- versionCode: 10601,`
`10`		`- versionName: '1.7.0-SNAPSHOT',`
`11`	`9`	`buildTools: '29.0.3',`
`12`	`10`	`packageName: 'dev.msfjarvis.aps'`
`13`	`11`	`]`