From: Soren Stoutner Date: Fri, 27 Mar 2026 17:57:50 +0000 (-0700) Subject: Build against the default Java Version. https://redmine.stoutner.com/issues/1301 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=df7d4f3f5235c3edb966cddd0a3b732500911f3c;p=PrivacyCell.git Build against the default Java Version. https://redmine.stoutner.com/issues/1301 --- diff --git a/app/build.gradle b/app/build.gradle index fe8b635..d7456ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,17 +33,6 @@ android { resourceConfigurations += ['en', 'de', 'es', 'fr', 'it', 'ru'] } - // 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 @@ -68,7 +57,7 @@ dependencies { implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0' implementation 'androidx.webkit:webkit:1.15.0' - implementation 'androidx.work:work-runtime-ktx:2.11.1' + implementation 'androidx.work:work-runtime-ktx:2.11.2' // Include the Kotlin standard library. This should be the same version number listed in the project build.gradle. implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10' diff --git a/app/src/main/assets/de/changelog.html b/app/src/main/assets/de/changelog.html index 2af96fe..bf4ad2a 100644 --- a/app/src/main/assets/de/changelog.html +++ b/app/src/main/assets/de/changelog.html @@ -33,7 +33,7 @@

1.12.1 (Code-Version 15)

-

19. März 2026 - Mindest-API 30, Ziel-API 36

+

19. März 2026 - Mindest-API 30, Ziel-API 36

diff --git a/app/src/main/assets/en/changelog.html b/app/src/main/assets/en/changelog.html index a73f0c1..db9676d 100644 --- a/app/src/main/assets/en/changelog.html +++ b/app/src/main/assets/en/changelog.html @@ -31,7 +31,7 @@

1.12.1 (version code 15)

-

19 March 2026 - minimum API 30, target API 36

+

19 March 2026 - minimum API 30, target API 36

diff --git a/app/src/main/assets/es/changelog.html b/app/src/main/assets/es/changelog.html index 6baaaed..3fc4e81 100644 --- a/app/src/main/assets/es/changelog.html +++ b/app/src/main/assets/es/changelog.html @@ -33,7 +33,7 @@

1.12.1 (versión del código 15)

-

19 de marzo de 2026 - API mínimo 30, API objetivo 36

+

19 de marzo de 2026 - API mínimo 30, API objetivo 36

diff --git a/app/src/main/assets/fr/changelog.html b/app/src/main/assets/fr/changelog.html index 8d9b96f..662fb23 100644 --- a/app/src/main/assets/fr/changelog.html +++ b/app/src/main/assets/fr/changelog.html @@ -33,7 +33,7 @@

1.12.1 (version du code 15)

-

19 Mars 2026 - API minimale : 30, API optimale : 36

+

19 Mars 2026 - API minimale : 30, API optimale : 36

diff --git a/app/src/main/assets/it/changelog.html b/app/src/main/assets/it/changelog.html index bb22d31..d71587e 100644 --- a/app/src/main/assets/it/changelog.html +++ b/app/src/main/assets/it/changelog.html @@ -33,7 +33,7 @@

1.12.1 (versione codice 15)

-

19 Marzo 2026 - minima API 30, target API 36

+

19 Marzo 2026 - minima API 30, target API 36

diff --git a/app/src/main/assets/ru/changelog.html b/app/src/main/assets/ru/changelog.html index de18960..2d8fcd6 100644 --- a/app/src/main/assets/ru/changelog.html +++ b/app/src/main/assets/ru/changelog.html @@ -31,7 +31,7 @@

1.12.1 (код версии 15)

-

19 марта 2026 года - минимальный API 30, целевой API 36

+

19 марта 2026 года - минимальный API 30, целевой API 36