From 5ce8528d1db1b20c382692856c17714f0a70de6d Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 27 Mar 2026 10:54:34 -0700 Subject: [PATCH] Build against the default Java version. https://redmine.stoutner.com/issues/1300 --- app/build.gradle | 11 ----------- app/src/main/assets/de/about_changelog.html | 2 +- app/src/main/assets/en/about_changelog.html | 2 +- app/src/main/assets/es/about_changelog.html | 4 ++-- app/src/main/assets/fr/about_changelog.html | 2 +- app/src/main/assets/it/about_changelog.html | 2 +- app/src/main/assets/pt-rBR/about_changelog.html | 2 +- app/src/main/assets/ru/about_changelog.html | 2 +- app/src/main/assets/tr/about_changelog.html | 2 +- app/src/main/assets/zh-rCN/about_changelog.html | 2 +- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 4 ++-- app/src/main/res/values-pt-rBR/strings.xml | 4 +--- app/src/main/res/values-ru/strings.xml | 4 ++-- app/src/main/res/values-tr/strings.xml | 3 +-- app/src/main/res/values-zh-rCN/strings.xml | 3 +-- app/src/main/res/values/strings.xml | 2 +- 19 files changed, 20 insertions(+), 39 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e5c66089..15ab5c3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,17 +35,6 @@ android { resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'pt-rBR', 'ru', 'tr', 'zh-rCN'] } - // Specify the compile Java version. This must match the Kotlin JVM target. For some reason the system was not setting this correctly. These can probably be removed in the future. - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - // Specify the Kotlin JVM target. This must match the compile Java version. For some reason the system was not setting this correctly. These can probably be removed in the future. - kotlin { - jvmToolchain(17) - } - buildTypes { debug { minifyEnabled false diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index f9ca2c36..43760d93 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -34,7 +34,7 @@

3.20 (Code-Version 80)

-

12. März 2026 - Mindest-API 26, Ziel-API 36

+

12. März 2026 - Mindest-API 26, Ziel-API 36