diff --git a/ci/templates/multiplatform-template/android/build.gradle.kts b/ci/templates/multiplatform-template/android/build.gradle.kts index fed67b2b03..93c11c5f27 100644 --- a/ci/templates/multiplatform-template/android/build.gradle.kts +++ b/ci/templates/multiplatform-template/android/build.gradle.kts @@ -5,18 +5,21 @@ plugins { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) } } diff --git a/ci/templates/multiplatform-template/common/build.gradle.kts b/ci/templates/multiplatform-template/common/build.gradle.kts index 8cb4ff1713..4aa05685f6 100644 --- a/ci/templates/multiplatform-template/common/build.gradle.kts +++ b/ci/templates/multiplatform-template/common/build.gradle.kts @@ -28,18 +28,18 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 26 - targetSdk = 33 } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) } - sourceSets { named("main") { manifest.srcFile("src/androidMain/AndroidManifest.xml") diff --git a/ci/templates/multiplatform-template/gradle.properties b/ci/templates/multiplatform-template/gradle.properties index 817ad7211a..1a553a85ae 100644 --- a/ci/templates/multiplatform-template/gradle.properties +++ b/ci/templates/multiplatform-template/gradle.properties @@ -3,5 +3,5 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official kotlin.version=1.9.10 -agp.version=7.1.3 +agp.version=8.0.2 compose.version=1.5.1 diff --git a/ci/templates/multiplatform-template/settings.gradle.kts b/ci/templates/multiplatform-template/settings.gradle.kts index 55535932b5..10d4f39c4c 100644 --- a/ci/templates/multiplatform-template/settings.gradle.kts +++ b/ci/templates/multiplatform-template/settings.gradle.kts @@ -15,4 +15,8 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + include(":common", ":android", ":desktop") diff --git a/examples/chat/androidApp/build.gradle.kts b/examples/chat/androidApp/build.gradle.kts index 98f0ecb2d1..b81b5edf8e 100644 --- a/examples/chat/androidApp/build.gradle.kts +++ b/examples/chat/androidApp/build.gradle.kts @@ -26,10 +26,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/chat/settings.gradle.kts b/examples/chat/settings.gradle.kts index bccac02bc0..f4e86353f3 100644 --- a/examples/chat/settings.gradle.kts +++ b/examples/chat/settings.gradle.kts @@ -20,6 +20,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "chat-mpp" include(":androidApp") diff --git a/examples/chat/shared/build.gradle.kts b/examples/chat/shared/build.gradle.kts index d705173b34..0c8bd1dfc1 100644 --- a/examples/chat/shared/build.gradle.kts +++ b/examples/chat/shared/build.gradle.kts @@ -103,10 +103,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/cocoapods-ios-example/androidApp/build.gradle.kts b/examples/cocoapods-ios-example/androidApp/build.gradle.kts index 5c1da2f618..478d6a5562 100644 --- a/examples/cocoapods-ios-example/androidApp/build.gradle.kts +++ b/examples/cocoapods-ios-example/androidApp/build.gradle.kts @@ -29,10 +29,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/cocoapods-ios-example/settings.gradle.kts b/examples/cocoapods-ios-example/settings.gradle.kts index 695f3748ad..442570deaf 100644 --- a/examples/cocoapods-ios-example/settings.gradle.kts +++ b/examples/cocoapods-ios-example/settings.gradle.kts @@ -26,6 +26,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + dependencyResolutionManagement { repositories { google() diff --git a/examples/cocoapods-ios-example/shared/build.gradle.kts b/examples/cocoapods-ios-example/shared/build.gradle.kts index b6a8eb05fb..bd09f3c364 100644 --- a/examples/cocoapods-ios-example/shared/build.gradle.kts +++ b/examples/cocoapods-ios-example/shared/build.gradle.kts @@ -58,10 +58,10 @@ android { minSdk = (findProperty("android.minSdk") as String).toInt() } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/codeviewer/androidApp/build.gradle.kts b/examples/codeviewer/androidApp/build.gradle.kts index 8aa680de78..ed2aea72c2 100644 --- a/examples/codeviewer/androidApp/build.gradle.kts +++ b/examples/codeviewer/androidApp/build.gradle.kts @@ -26,10 +26,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/codeviewer/settings.gradle.kts b/examples/codeviewer/settings.gradle.kts index a1d0b79e3e..b5ede7c35d 100644 --- a/examples/codeviewer/settings.gradle.kts +++ b/examples/codeviewer/settings.gradle.kts @@ -21,6 +21,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "codeviewer" include(":androidApp") diff --git a/examples/codeviewer/shared/build.gradle.kts b/examples/codeviewer/shared/build.gradle.kts index 7fd666d718..c4d82d43d1 100644 --- a/examples/codeviewer/shared/build.gradle.kts +++ b/examples/codeviewer/shared/build.gradle.kts @@ -73,10 +73,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/falling-balls/androidApp/build.gradle.kts b/examples/falling-balls/androidApp/build.gradle.kts index c0f3a522d8..0d7ab8e11f 100644 --- a/examples/falling-balls/androidApp/build.gradle.kts +++ b/examples/falling-balls/androidApp/build.gradle.kts @@ -26,10 +26,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/falling-balls/settings.gradle.kts b/examples/falling-balls/settings.gradle.kts index 95b7916058..9f32e9dd8a 100644 --- a/examples/falling-balls/settings.gradle.kts +++ b/examples/falling-balls/settings.gradle.kts @@ -20,6 +20,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "falling-balls-mpp" include(":androidApp") diff --git a/examples/falling-balls/shared/build.gradle.kts b/examples/falling-balls/shared/build.gradle.kts index be57a84018..b88d1299aa 100644 --- a/examples/falling-balls/shared/build.gradle.kts +++ b/examples/falling-balls/shared/build.gradle.kts @@ -116,10 +116,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/imageviewer/androidApp/build.gradle.kts b/examples/imageviewer/androidApp/build.gradle.kts index 37d64f3ca6..a012869a76 100755 --- a/examples/imageviewer/androidApp/build.gradle.kts +++ b/examples/imageviewer/androidApp/build.gradle.kts @@ -27,11 +27,11 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/imageviewer/settings.gradle.kts b/examples/imageviewer/settings.gradle.kts index b0c6f499c9..036100a971 100644 --- a/examples/imageviewer/settings.gradle.kts +++ b/examples/imageviewer/settings.gradle.kts @@ -21,6 +21,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "imageviewer" include(":androidApp") diff --git a/examples/imageviewer/shared/build.gradle.kts b/examples/imageviewer/shared/build.gradle.kts index a473a24a34..24cb5db809 100755 --- a/examples/imageviewer/shared/build.gradle.kts +++ b/examples/imageviewer/shared/build.gradle.kts @@ -95,10 +95,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/issues/android/build.gradle.kts b/examples/issues/android/build.gradle.kts index c033634803..4f3cddac74 100644 --- a/examples/issues/android/build.gradle.kts +++ b/examples/issues/android/build.gradle.kts @@ -16,11 +16,11 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/issues/common/build.gradle.kts b/examples/issues/common/build.gradle.kts index 888c6cce72..675ee9d480 100644 --- a/examples/issues/common/build.gradle.kts +++ b/examples/issues/common/build.gradle.kts @@ -46,11 +46,11 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } sourceSets { named("main") { diff --git a/examples/issues/settings.gradle.kts b/examples/issues/settings.gradle.kts index f4ac8d1ff7..9cf1b8d179 100644 --- a/examples/issues/settings.gradle.kts +++ b/examples/issues/settings.gradle.kts @@ -19,4 +19,8 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + include(":common", ":android", ":desktop") diff --git a/examples/minesweeper/androidApp/build.gradle.kts b/examples/minesweeper/androidApp/build.gradle.kts index 14d310323c..dfd8f1bf23 100644 --- a/examples/minesweeper/androidApp/build.gradle.kts +++ b/examples/minesweeper/androidApp/build.gradle.kts @@ -26,10 +26,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/minesweeper/settings.gradle.kts b/examples/minesweeper/settings.gradle.kts index a5c3565b83..6ed7a53ada 100644 --- a/examples/minesweeper/settings.gradle.kts +++ b/examples/minesweeper/settings.gradle.kts @@ -20,6 +20,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "minesweeper" include(":androidApp") diff --git a/examples/minesweeper/shared/build.gradle.kts b/examples/minesweeper/shared/build.gradle.kts index 835606f27f..0df0b481ae 100644 --- a/examples/minesweeper/shared/build.gradle.kts +++ b/examples/minesweeper/shared/build.gradle.kts @@ -126,10 +126,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/todoapp-lite/androidApp/build.gradle.kts b/examples/todoapp-lite/androidApp/build.gradle.kts index 66bef8fbee..50c5f5f440 100755 --- a/examples/todoapp-lite/androidApp/build.gradle.kts +++ b/examples/todoapp-lite/androidApp/build.gradle.kts @@ -27,10 +27,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/todoapp-lite/settings.gradle.kts b/examples/todoapp-lite/settings.gradle.kts index 279b5471e7..b68b8e6228 100755 --- a/examples/todoapp-lite/settings.gradle.kts +++ b/examples/todoapp-lite/settings.gradle.kts @@ -19,6 +19,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "todoapp-lite" include(":androidApp") diff --git a/examples/todoapp-lite/shared/build.gradle.kts b/examples/todoapp-lite/shared/build.gradle.kts index b4cdc99ab6..fd401d7144 100755 --- a/examples/todoapp-lite/shared/build.gradle.kts +++ b/examples/todoapp-lite/shared/build.gradle.kts @@ -72,10 +72,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/visual-effects/androidApp/build.gradle.kts b/examples/visual-effects/androidApp/build.gradle.kts index b95ee0a7d4..a0575f7eb2 100644 --- a/examples/visual-effects/androidApp/build.gradle.kts +++ b/examples/visual-effects/androidApp/build.gradle.kts @@ -26,10 +26,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/visual-effects/settings.gradle.kts b/examples/visual-effects/settings.gradle.kts index 665c2f3deb..1b7a2ddc8b 100644 --- a/examples/visual-effects/settings.gradle.kts +++ b/examples/visual-effects/settings.gradle.kts @@ -20,6 +20,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "visual-effects" include(":androidApp") diff --git a/examples/visual-effects/shared/build.gradle.kts b/examples/visual-effects/shared/build.gradle.kts index a1a034bee1..aa74c78616 100644 --- a/examples/visual-effects/shared/build.gradle.kts +++ b/examples/visual-effects/shared/build.gradle.kts @@ -71,10 +71,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/widgets-gallery/androidApp/build.gradle.kts b/examples/widgets-gallery/androidApp/build.gradle.kts index 42ca2996f3..2cf4ecfbd9 100644 --- a/examples/widgets-gallery/androidApp/build.gradle.kts +++ b/examples/widgets-gallery/androidApp/build.gradle.kts @@ -26,10 +26,10 @@ android { versionName = "1.0" } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } } diff --git a/examples/widgets-gallery/settings.gradle.kts b/examples/widgets-gallery/settings.gradle.kts index 76eb8f5ec8..b1665a68cd 100644 --- a/examples/widgets-gallery/settings.gradle.kts +++ b/examples/widgets-gallery/settings.gradle.kts @@ -20,6 +20,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + rootProject.name = "widgets-gallery" include(":androidApp") diff --git a/examples/widgets-gallery/shared/build.gradle.kts b/examples/widgets-gallery/shared/build.gradle.kts index c9f8b5c6ba..dddee39c28 100644 --- a/examples/widgets-gallery/shared/build.gradle.kts +++ b/examples/widgets-gallery/shared/build.gradle.kts @@ -73,10 +73,10 @@ android { minSdk = 26 } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { - jvmToolchain(11) + jvmToolchain(17) } }