From 295d7a24e0ffad40276c93cae353eb90133c8274 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 20:21:55 +0000 Subject: [PATCH 1/2] Bump watermelon from 1.3.0 to 1.4.0 Bumps `watermelon` from 1.3.0 to 1.4.0. Updates `com.inkapplications.watermelon:coroutines` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/inkapplications/watermelon/releases) - [Changelog](https://github.com/InkApplications/Watermelon/blob/master/CHANGELOG.md) - [Commits](https://github.com/inkapplications/watermelon/compare/1.3.0...1.4.0) Updates `com.inkapplications.watermelon:standard` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/inkapplications/watermelon/releases) - [Changelog](https://github.com/InkApplications/Watermelon/blob/master/CHANGELOG.md) - [Commits](https://github.com/inkapplications/watermelon/compare/1.3.0...1.4.0) Updates `com.inkapplications.watermelon:android` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/inkapplications/watermelon/releases) - [Changelog](https://github.com/InkApplications/Watermelon/blob/master/CHANGELOG.md) - [Commits](https://github.com/inkapplications/watermelon/compare/1.3.0...1.4.0) --- updated-dependencies: - dependency-name: com.inkapplications.watermelon:coroutines dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.inkapplications.watermelon:standard dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.inkapplications.watermelon:android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 508686a..ae54c7e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ compose-compiler = "1.5.9" ack = "1.0.0" kimchi-core = "2.1.2" kimchi-firebase = "2.0.0" -watermelon = "1.3.0" +watermelon = "1.4.0" kotlin = "1.9.22" coroutines = "1.8.0" dagger = "2.46.1" From e8af089e316eb30fd305f932bde3a57880c6b6b5 Mon Sep 17 00:00:00 2001 From: Renee Vandervelde Date: Mon, 19 Feb 2024 21:10:50 -0600 Subject: [PATCH 2/2] Update jvm target to java 11 --- android-application/build.gradle.kts | 6 +++--- android-extensions/build.gradle.kts | 6 +++--- aprs-android/build.gradle.kts | 6 +++--- build.gradle.kts | 2 +- mapbox/build.gradle.kts | 6 +++--- maps/build.gradle.kts | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/android-application/build.gradle.kts b/android-application/build.gradle.kts index 8fba81f..55f22a4 100644 --- a/android-application/build.gradle.kts +++ b/android-application/build.gradle.kts @@ -73,12 +73,12 @@ android { } } compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 isCoreLibraryDesugaringEnabled = true } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_11.toString() freeCompilerArgs += listOf( "-P", "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=" + diff --git a/android-extensions/build.gradle.kts b/android-extensions/build.gradle.kts index fc429bf..1f4177a 100644 --- a/android-extensions/build.gradle.kts +++ b/android-extensions/build.gradle.kts @@ -17,14 +17,14 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } composeOptions { kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } } diff --git a/aprs-android/build.gradle.kts b/aprs-android/build.gradle.kts index 73fd684..59e952e 100644 --- a/aprs-android/build.gradle.kts +++ b/aprs-android/build.gradle.kts @@ -44,11 +44,11 @@ android { } } compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_11.toString() } } diff --git a/build.gradle.kts b/build.gradle.kts index 477125a..dbc8b9c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,7 @@ subprojects { afterEvaluate { tasks.withType { kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } } } diff --git a/mapbox/build.gradle.kts b/mapbox/build.gradle.kts index 51967de..5f3d969 100644 --- a/mapbox/build.gradle.kts +++ b/mapbox/build.gradle.kts @@ -16,14 +16,14 @@ android { buildConfig = true } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } composeOptions { kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } } diff --git a/maps/build.gradle.kts b/maps/build.gradle.kts index fe36fc0..857c334 100644 --- a/maps/build.gradle.kts +++ b/maps/build.gradle.kts @@ -16,14 +16,14 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_11.toString() } composeOptions { kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() } compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } }