AS LadyBug, we stick with Java 17 for the moment. Compiling with 21 f…

…ails with: com.sun.tools.javac.code.Symbol$CompletionFailure: class file for java.lang.MatchException not found
mtotschnig · Oct 7, 2024 · 0593eb6 · 0593eb6
1 parent 0cd575f
commit 0593eb6
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ ext {
     resConfig = ['en', 'en-rGB', 'ar', 'bg', 'ca', 'cs', 'da', 'de', 'de-rDE', 'el', 'es', 'eu', 'fr', 'fr-rCA', 'hr', 'hu', 'it', 'iw', 'ja', 'km', 'kn', 'ko', 'ms', 'nl', 'pl', 'pt-rBR', 'pt-rPT', 'ro', 'ru', 'si', 'ta', 'te', 'tr', 'uk', 'ur', 'vi', 'zh-rCN', 'zh-rHK', 'zh-rTW']
     versionCode = 759
     versionName = '3.8.9'
-    compileSdkVersion = 34
+    compileSdkVersion = 35
     minSdkVersion = 21
     targetSdkVersion = 34
 }

diff --git a/drive/build.gradle b/drive/build.gradle
@@ -16,6 +16,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     namespace 'org.totschnig.drive'
 }
 

diff --git a/dropbox/build.gradle b/dropbox/build.gradle
@@ -15,6 +15,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     namespace 'org.totschnig.dropbox'
 }
 

diff --git a/fints/build.gradle b/fints/build.gradle
@@ -22,6 +22,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     buildFeatures {
         compose true
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ accompanist = "0.36.0"
 acraVersion = "5.11.3"
 activityCompose = "1.9.2"
 androidDesugar = "2.1.2"
-androidGradlePlugin = "8.6.1"
+androidGradlePlugin = "8.7.0"
 androidImageCropper = "96a06733f3"
 androidSupportTestVersion = "1.6.1"
 androidxArchVersion = "2.2.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jan 10 17:14:16 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mlkit/build.gradle b/mlkit/build.gradle
@@ -16,6 +16,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/mlkit_deva/build.gradle b/mlkit_deva/build.gradle
@@ -15,6 +15,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/mlkit_jpan/build.gradle b/mlkit_jpan/build.gradle
@@ -15,6 +15,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/mlkit_kore/build.gradle b/mlkit_kore/build.gradle
@@ -15,6 +15,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/mlkit_latn/build.gradle b/mlkit_latn/build.gradle
@@ -15,6 +15,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/myExpenses/build.gradle b/myExpenses/build.gradle
@@ -50,6 +50,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     /*signingConfigs {
         release {

diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/task/TaskExecutionFragment.java b/myExpenses/src/main/java/org/totschnig/myexpenses/task/TaskExecutionFragment.java
@@ -22,16 +22,12 @@
 import android.os.Bundle;
 
 import org.totschnig.myexpenses.MyApplication;
-import org.totschnig.myexpenses.export.qif.QifDateFormat;
-import org.totschnig.myexpenses.model.CurrencyUnit;
-import org.totschnig.myexpenses.provider.DatabaseConstants;
 import org.totschnig.myexpenses.util.crashreporting.CrashHandler;
 
 import java.io.Serializable;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import timber.log.Timber;
 
 
 /**

diff --git a/myExpenses/src/main/java/org/totschnig/myexpenses/viewmodel/repository/RoadmapRepository.kt b/myExpenses/src/main/java/org/totschnig/myexpenses/viewmodel/repository/RoadmapRepository.kt
@@ -155,12 +155,12 @@ class RoadmapRepository @Inject constructor(
         val ce = context.packageManager.getPackageInfo(
             context.packageName,
             PackageManager.GET_SIGNATURES
-        ).signatures.first()
+        ).signatures?.first()
         buildString {
             MessageDigest.getInstance("SHA-1")
                 .digest(
                     CertificateFactory.getInstance("X509")
-                        .generateCertificate(ByteArrayInputStream(ce.toByteArray()))
+                        .generateCertificate(ByteArrayInputStream(ce?.toByteArray()))
                         .encoded
                 ).forEach {
                     val appendString = Integer.toHexString(0xFF and it.toInt())

diff --git a/ocr/build.gradle b/ocr/build.gradle
@@ -18,6 +18,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     flavorDimensions "textRecognition"
 

diff --git a/onedrive/build.gradle b/onedrive/build.gradle
@@ -18,6 +18,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     packagingOptions {
         jniLibs {
             excludes += ['META-INF/*']

diff --git a/shared-test/build.gradle b/shared-test/build.gradle
@@ -15,6 +15,9 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/sqlcrypt/build.gradle b/sqlcrypt/build.gradle
@@ -17,6 +17,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/tesseract/build.gradle b/tesseract/build.gradle
@@ -16,6 +16,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

diff --git a/webdav/build.gradle b/webdav/build.gradle
@@ -14,6 +14,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     buildFeatures {
         viewBinding true
     }

diff --git a/webui/build.gradle b/webui/build.gradle
@@ -19,6 +19,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     packagingOptions {
         jniLibs {
             excludes += ['META-INF/*']