diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f30fc8e40..4f58b4950 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,6 @@ jobs: with: distribution: 'zulu' java-version: | - 11 15 17 @@ -129,6 +128,11 @@ jobs: if: github.event_name == 'pull_request' run: ./gradlew lintDebug + - name: 'Qodana Scan' + uses: JetBrains/qodana-action@main + env: + QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} + - name: Setup Ruby if: github.event_name == 'pull_request' uses: ruby/setup-ruby@v1 diff --git a/aboutlibraries-compose-m2/build.gradle.kts b/aboutlibraries-compose-m2/build.gradle.kts index 0c511698c..9af84c788 100644 --- a/aboutlibraries-compose-m2/build.gradle.kts +++ b/aboutlibraries-compose-m2/build.gradle.kts @@ -30,13 +30,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" if (project.findProperty("composeCompilerReports") == "true") { freeCompilerArgs += listOf( diff --git a/aboutlibraries-compose-m3/build.gradle.kts b/aboutlibraries-compose-m3/build.gradle.kts index dad384b8a..553217739 100644 --- a/aboutlibraries-compose-m3/build.gradle.kts +++ b/aboutlibraries-compose-m3/build.gradle.kts @@ -30,13 +30,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" if (project.findProperty("composeCompilerReports") == "true") { freeCompilerArgs += listOf( "-P", diff --git a/aboutlibraries-core/build.gradle.kts b/aboutlibraries-core/build.gradle.kts index 9c8ddb522..6c3b4f581 100644 --- a/aboutlibraries-core/build.gradle.kts +++ b/aboutlibraries-core/build.gradle.kts @@ -1,4 +1,5 @@ import com.vanniktech.maven.publish.SonatypeHost +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -25,17 +26,19 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType { - kotlinOptions { - jvmTarget = "11" - freeCompilerArgs += listOf( - "-P", - "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=" + - "${project.path}/compose_compiler_config.conf" + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + freeCompilerArgs.addAll( + listOf( + "-P", + "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=" + + "${project.path}/compose_compiler_config.conf" + ) ) } } diff --git a/aboutlibraries/build.gradle b/aboutlibraries/build.gradle index 5811165ea..56cd0b698 100644 --- a/aboutlibraries/build.gradle +++ b/aboutlibraries/build.gradle @@ -36,18 +36,22 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } // specify the artifactId as module-name for kotlin kotlinOptions.freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID] } +kotlin { + jvmToolchain(17) +} + dependencies { api project(':aboutlibraries-core') diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts index 01c0cb362..a87482b17 100644 --- a/app-desktop/build.gradle.kts +++ b/app-desktop/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -30,12 +31,14 @@ dependencies { } tasks.withType { - sourceCompatibility = "11" - targetCompatibility = "11" + sourceCompatibility = "17" + targetCompatibility = "17" } tasks.withType { - kotlinOptions.jvmTarget = "11" + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } application { diff --git a/app/build.gradle b/app/build.gradle index bfea289bc..8247bdccd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,12 +65,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "11" + jvmTarget = "17" } buildFeatures { diff --git a/multiplatform-demo/build.gradle.kts b/multiplatform-demo/build.gradle.kts index ec7764f2c..e4c4d635e 100644 --- a/multiplatform-demo/build.gradle.kts +++ b/multiplatform-demo/build.gradle.kts @@ -28,7 +28,7 @@ repositories { kotlin { jvm { compilations.all { - kotlinOptions.jvmTarget = "11" + kotlinOptions.jvmTarget = "17" } withJava() } diff --git a/plugin-build/plugin/build.gradle b/plugin-build/plugin/build.gradle index 393bbe674..5caf79bbb 100644 --- a/plugin-build/plugin/build.gradle +++ b/plugin-build/plugin/build.gradle @@ -42,12 +42,8 @@ repositories { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} - -kotlin { - jvmToolchain(11) + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } dependencies {