Merge pull request #37 from KiARC/dev

v5.4.2 Lots of Patches
KiARC · Oct 17, 2022 · 437ac37 · 437ac37
2 parents 3629f91 + 129a4eb
commit 437ac37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,10 +17,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 17
+    - name: set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '11'
         distribution: 'temurin'
         cache: gradle
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.katiearose.sobriety"
         minSdk 26
         targetSdk 30
-        versionCode 12
-        versionName "v5.2.1"
+        versionCode 13
+        versionName "v5.4.2"
         setProperty("archivesBaseName", "Sobriety $versionName")
     }
 
@@ -35,11 +35,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_16
-        targetCompatibility JavaVersion.VERSION_16
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '11'
     }
     buildFeatures {
         viewBinding true
@@ -55,4 +55,4 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
+}
diff --git a/app/src/main/java/com/katiearose/sobriety/Main.kt b/app/src/main/java/com/katiearose/sobriety/Main.kt
@@ -56,7 +56,8 @@ class Main : AppCompatActivity() {
         addCardButton.setOnClickListener { newCardDialog() }
         prompt = findViewById(R.id.prompt)
         cacheHandler = CacheHandler(this)
-        try {
+        if (addictions.isEmpty())
+            try {
             this.openFileInput("Sobriety.cache").use {
                 addictions.addAll(cacheHandler.readCache(it))
             }

diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt
@@ -0,0 +1,4 @@
+v5.4.2 Lots Of Patches:
+  - Fixed future dates being able to be selected
+  - Downgraded to JDK11 for compatibility with more devices
+  - Patched duplication bug