From d8805a6b3a521c84f2440d2798ad78da1bc99991 Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Wed, 8 Jan 2025 17:08:21 +0000 Subject: [PATCH] Removing toolchain --- JetLagged/app/build.gradle.kts | 3 --- JetNews/app/build.gradle.kts | 4 ---- Jetcaster/core/domain-testing/build.gradle.kts | 4 +--- Jetcaster/core/domain/build.gradle.kts | 4 +--- Jetcaster/glancewidget/build.gradle.kts | 3 --- Jetcaster/tv/build.gradle.kts | 4 +--- Jetcaster/wear/build.gradle | 4 +--- Jetchat/app/build.gradle.kts | 3 --- Jetsnack/app/build.gradle.kts | 2 -- Reply/app/build.gradle.kts | 3 --- 10 files changed, 4 insertions(+), 30 deletions(-) diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index 9406732898..d4a0b1dc56 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -74,9 +74,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } buildFeatures { compose = true // Disable unused AGP features diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index f8bb76ed57..445f09ba7a 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -77,10 +77,6 @@ android { } } -kotlin { - jvmToolchain(17) -} - dependencies { val composeBom = platform(libs.androidx.compose.bom) implementation(composeBom) diff --git a/Jetcaster/core/domain-testing/build.gradle.kts b/Jetcaster/core/domain-testing/build.gradle.kts index 28c64e5809..45c2e053dc 100644 --- a/Jetcaster/core/domain-testing/build.gradle.kts +++ b/Jetcaster/core/domain-testing/build.gradle.kts @@ -29,9 +29,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } } -kotlin { - jvmToolchain(17) -} + dependencies { implementation(projects.core.domain) diff --git a/Jetcaster/core/domain/build.gradle.kts b/Jetcaster/core/domain/build.gradle.kts index a6803eda2b..af18471fd8 100644 --- a/Jetcaster/core/domain/build.gradle.kts +++ b/Jetcaster/core/domain/build.gradle.kts @@ -31,9 +31,7 @@ android { targetCompatibility = JavaVersion.VERSION_17 } } -kotlin { - jvmToolchain(17) -} + dependencies { coreLibraryDesugaring(libs.core.jdk.desugaring) implementation(projects.core.data) diff --git a/Jetcaster/glancewidget/build.gradle.kts b/Jetcaster/glancewidget/build.gradle.kts index 28810bc577..1acbac07eb 100644 --- a/Jetcaster/glancewidget/build.gradle.kts +++ b/Jetcaster/glancewidget/build.gradle.kts @@ -36,9 +36,6 @@ android { } } } -kotlin { - jvmToolchain(17) -} dependencies { diff --git a/Jetcaster/tv/build.gradle.kts b/Jetcaster/tv/build.gradle.kts index 8a17d596a9..1e4b288325 100644 --- a/Jetcaster/tv/build.gradle.kts +++ b/Jetcaster/tv/build.gradle.kts @@ -81,9 +81,7 @@ android { } } } -kotlin { - jvmToolchain(17) -} + dependencies { implementation(libs.androidx.core.ktx) diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle index 4b10f6f8e8..4d6ef4a83e 100644 --- a/Jetcaster/wear/build.gradle +++ b/Jetcaster/wear/build.gradle @@ -69,9 +69,7 @@ android { } } } -kotlin { - jvmToolchain(17) -} + dependencies { diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts index f23f12439e..24e779227c 100644 --- a/Jetchat/app/build.gradle.kts +++ b/Jetchat/app/build.gradle.kts @@ -79,9 +79,6 @@ android { } } -kotlin { - jvmToolchain(17) -} dependencies { val composeBom = platform(libs.androidx.compose.bom) implementation(composeBom) diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts index dd57a40578..a58d44b6e5 100644 --- a/Jetsnack/app/build.gradle.kts +++ b/Jetsnack/app/build.gradle.kts @@ -78,8 +78,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { jvmTarget = "17" } - buildFeatures { compose = true } diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts index 7f9264dbcf..fe425fde09 100644 --- a/Reply/app/build.gradle.kts +++ b/Reply/app/build.gradle.kts @@ -93,9 +93,6 @@ android { compose = true } } -kotlin { - jvmToolchain(17) -} dependencies { val composeBom = platform(libs.androidx.compose.bom)