A lot of UI improvements

rparkins999 · Dec 15, 2021 · cd4b1a4 · cd4b1a4
1 parent 354979f
commit cd4b1a4
Show file tree

Hide file tree

Showing 4 changed files with 856 additions and 301 deletions.
diff --git a/SecondsClock/build.gradle b/SecondsClock/build.gradle
@@ -9,8 +9,9 @@ def keystorePropertiesFile = rootProject.file("../Keys/keystore.properties")
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
+
 android {
-    compileSdk 30
+    compileSdk 31
 
     signingConfigs {
         config {
@@ -24,19 +25,21 @@ android {
         applicationId "uk.co.yahoo.p1rpp.secondsclock"
         minSdk 26
         targetSdk 26
-        versionCode 1
-        versionName "0.1"
+        versionCode 2
+        versionName "1.0"
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
             signingConfig signingConfigs.config
+            delete("build/intermediates/incremental/mergeReleaseResources/merger.xml")
             resValue("string", 'build_time', "${(new Date()).toString()}")
         }
         debug {
             signingConfig signingConfigs.config
+            delete("build/intermediates/incremental/mergeDebugResources/merger.xml")
             resValue("string", 'build_time', "${(new Date()).toString()}")
         }
     }