From 3d0850fa1ff84b30891b868fc04f2450d9bc9163 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Tue, 21 Apr 2020 13:54:24 +0530
Subject: build: inline versionCode and versionName at destination

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/build.gradle    | 4 +++-
 build.gradle        | 3 ---
 dependencies.gradle | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 00f66635..9355b8b9 100644
--- 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
index 2120b6f9..3f2e5455 100644
--- 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
index 01f1d249..88d118e6 100644
--- 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'
 ]
-- 
cgit v1.2.3