From 41638b4427fad9e970ae981b0539053dbb2b3155 Mon Sep 17 00:00:00 2001 From: Da Risk Date: Wed, 18 Jan 2023 12:35:37 -0400 Subject: [PATCH] build: update to kotlin 1.8.0 --- build.gradle.kts | 13 +------------ buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/AndroidJavaVersion.kt | 7 +------ faviKonSnoop/build.gradle.kts | 4 ++++ gradle.properties | 3 --- gradle/libs.versions.toml | 2 +- htmlparsers/build.gradle.kts | 4 ++++ settings.gradle.kts | 8 -------- webapi/build.gradle.kts | 4 ++++ 9 files changed, 16 insertions(+), 31 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 644e72a8..e2fce32e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,19 +31,10 @@ plugins { // these should not be needed but for an unknown reason they get applied // with bad ordering if not there. or they can't be applied dynamically // version used is in gradle.properties - kotlin("jvm") apply false alias(libs.plugins.firebase.crashlytics) apply false alias(libs.plugins.google.gms.google.services) apply false } -// Need to be there because if not, the various plugins downgrade the AGP version used from buildSrc -// during the compilation of the *.gradle.kts script -buildscript { - dependencies { - classpath("com.android.tools.build:gradle:7.3.1") - } -} - // some extra properties extra["compileSdkInt"] = 33 @@ -65,9 +56,7 @@ allprojects { tasks.withType { kotlinOptions { - jvmTarget = "1.8" - freeCompilerArgs = listOf( - "-Xjvm-default=all", "-opt-in=kotlin.RequiresOptIn") + freeCompilerArgs = listOf("-Xjvm-default=all") } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 384f72b3..5deacaf2 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { implementation("com.github.triplet.gradle:play-publisher:3.7.0") implementation("com.geekorum.gradle.avdl:flydroid:0.0.3") // need to be added to work with compose https://issuetracker.google.com/issues/195342732 - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") // fix https://github.com/google/dagger/issues/3068 implementation("com.squareup:javapoet:1.13.0") diff --git a/buildSrc/src/main/kotlin/AndroidJavaVersion.kt b/buildSrc/src/main/kotlin/AndroidJavaVersion.kt index d2aa4a32..22507d6f 100644 --- a/buildSrc/src/main/kotlin/AndroidJavaVersion.kt +++ b/buildSrc/src/main/kotlin/AndroidJavaVersion.kt @@ -30,12 +30,7 @@ import org.gradle.kotlin.dsl.dependencies * Configure java version compile options based on minSdkVersion value */ fun BaseExtension.configureJavaVersion() { - val api = defaultConfig.minSdkVersion?.apiLevel ?: 1 - val version = when { - api >= 24 -> JavaVersion.VERSION_1_8 - api >= 19 -> JavaVersion.VERSION_1_7 - else -> JavaVersion.VERSION_1_6 - } + val version = JavaVersion.VERSION_11 compileOptions { sourceCompatibility = version targetCompatibility = version diff --git a/faviKonSnoop/build.gradle.kts b/faviKonSnoop/build.gradle.kts index 508186f3..6a74c988 100644 --- a/faviKonSnoop/build.gradle.kts +++ b/faviKonSnoop/build.gradle.kts @@ -23,6 +23,10 @@ plugins { alias(libs.plugins.kotlinx.serialization) } +kotlin { + jvmToolchain(11) +} + dependencies { implementation(kotlin("stdlib-jdk8")) implementation(enforcedPlatform(kotlin("bom"))) diff --git a/gradle.properties b/gradle.properties index f835c1f5..78645117 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,9 +17,6 @@ android.useAndroidX=true # disable it kapt.include.compile.classpath=false -# plugin dependencies version -kotlinVersion=1.7.20 - # specify path of geekdroid source to use them instead of the prebuilt library # GEEKDROID_PROJECT_DIR=/home/darisk/devel/geekorum/geekdroid/ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 637861d3..9806a94c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ androidx-fragment = "1.5.5" androidx-constraintlayout = "2.1.4" androidx-coordinatorlayout = "1.2.0" androidx-compose-bom = "2023.01.00" -androidx-compose-compiler = "1.3.2" +androidx-compose-compiler = "1.4.0" androidx-hilt-compiler = "1.0.0" androidx-hilt-navigation-compose = "1.0.0" androidx-hilt-work = "1.0.0" diff --git a/htmlparsers/build.gradle.kts b/htmlparsers/build.gradle.kts index 1b666e07..a000feff 100644 --- a/htmlparsers/build.gradle.kts +++ b/htmlparsers/build.gradle.kts @@ -22,6 +22,10 @@ plugins { kotlin("jvm") } +kotlin { + jvmToolchain(11) +} + dependencies { implementation(kotlin("stdlib-jdk8")) implementation(enforcedPlatform(kotlin("bom"))) diff --git a/settings.gradle.kts b/settings.gradle.kts index 57db11ee..f3bc9a73 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,14 +20,6 @@ */ pluginManagement { - val kotlinVersion: String by settings - - plugins { - kotlin("android") version kotlinVersion - kotlin("jvm") version kotlinVersion - kotlin("kapt") version kotlinVersion - } - repositories { gradlePluginPortal() mavenCentral() diff --git a/webapi/build.gradle.kts b/webapi/build.gradle.kts index 4d0b686e..e67c7439 100644 --- a/webapi/build.gradle.kts +++ b/webapi/build.gradle.kts @@ -24,6 +24,10 @@ plugins { alias(libs.plugins.kotlinx.serialization) } +kotlin { + jvmToolchain(11) +} + dependencies { implementation(kotlin("stdlib-jdk8")) implementation(enforcedPlatform(kotlin("bom")))