prepare for version 2.0

tasomaniac · Sep 30, 2018 · d0538c7 · d0538c7
1 parent 73bd1b5
commit d0538c7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,14 +14,14 @@ def secrets = buildProperties.secrets
 def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion versions.compileSdk
 
     defaultConfig {
         applicationId 'com.tasomaniac.muzei.comiccovers'
-        minSdkVersion 19
-        targetSdkVersion rootProject.ext.compileSdkVersion
-        versionCode rootProject.ext.versionMajor * 10000 + rootProject.ext.versionMinor * 1000 + rootProject.ext.versionPatch * 100 + rootProject.ext.versionBuild
-        versionName "${rootProject.ext.versionMajor}.${rootProject.ext.versionMinor}" + ((rootProject.ext.versionPatch != 0) ? ".${rootProject.ext.versionPatch}" : "")
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.compileSdk
+        versionCode versions.versionCode
+        versionName versions.versionName
         buildConfigString "GIT_SHA", gitSha
 
         buildConfigString "COMIC_VINE_CONSUMER_KEY", secrets['comicvine_consumer_key']

diff --git a/app/src/main/res/drawable-nodpi/ic_source_comiccovers.png b/app/src/main/res/drawable-nodpi/ic_source_comiccovers.png
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,17 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext.ci = 'true' == System.getenv('CI')
 
+    def versionMajor = 2
+    def versionMinor = 0
+    def versionBuild = 0
+
+    ext.versions = [
+            compileSdk : 28,
+            minSdk     : 19,
+            versionCode: versionMajor * 10000 + versionMinor * 100 + versionBuild,
+            versionName: "${versionMajor}.${versionMinor}",
+    ]
+
     repositories {
         gradlePluginPortal()
         google()
@@ -34,12 +43,4 @@ allprojects {
 
 ext {
     isTravis = "true".equals(System.getenv("TRAVIS"))
-    preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
-
-    versionMajor = 1
-    versionMinor = 0
-    versionPatch = 2
-    versionBuild = 0
-
-    compileSdkVersion = 28
 }