diff --git a/.github/workflows/kotlin.yaml b/.github/workflows/kotlin.yaml index 358c416c..1051e873 100644 --- a/.github/workflows/kotlin.yaml +++ b/.github/workflows/kotlin.yaml @@ -23,10 +23,8 @@ jobs: distribution: 'oracle' # See 'Supported distributions' for available options java-version: '21' cache: 'gradle' - - name: Setup Gradle 8.13 + - name: Setup Gradle uses: gradle/actions/setup-gradle@v5 - with: - gradle-version: 8.13 - name: Make gradle executable run: chmod +x ./gradlew @@ -69,10 +67,8 @@ jobs: java-version: 21 distribution: 'oracle' cache: 'gradle' - - name: Setup Gradle 8.13 + - name: Setup Gradle uses: gradle/actions/setup-gradle@v5 - with: - gradle-version: 8.13 - name: Make gradle executable run: chmod +x ./gradlew - name: Enable KVM group perms diff --git a/tictactoe_dart/android/app/build.gradle b/tictactoe_dart/android/app/build.gradle index 9055ead6..f6458ec6 100644 --- a/tictactoe_dart/android/app/build.gradle +++ b/tictactoe_dart/android/app/build.gradle @@ -35,10 +35,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' - } - sourceSets { main.java.srcDirs += 'src/main/kotlin' } diff --git a/tictactoe_kotlin/app/build.gradle b/tictactoe_kotlin/app/build.gradle index 3031e7c4..17e550ef 100644 --- a/tictactoe_kotlin/app/build.gradle +++ b/tictactoe_kotlin/app/build.gradle @@ -1,6 +1,5 @@ plugins { id 'com.android.application' - id 'org.jetbrains.kotlin.android' id 'org.jetbrains.kotlin.plugin.compose' } @@ -37,9 +36,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = '1.8' - } buildFeatures { compose true } @@ -74,7 +70,9 @@ dependencies { debugImplementation 'androidx.tracing:tracing:1.3.0' } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - languageVersion = "2.0" + kotlin { + compilerOptions { + languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0 + } } } diff --git a/tictactoe_kotlin/build.gradle b/tictactoe_kotlin/build.gradle index 7c0be1ef..9914647f 100644 --- a/tictactoe_kotlin/build.gradle +++ b/tictactoe_kotlin/build.gradle @@ -1,7 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.13.2' apply false - id 'com.android.library' version '8.13.2' apply false - id 'org.jetbrains.kotlin.android' version '2.3.0' apply false + id 'com.android.application' version '9.0.0' apply false + id 'com.android.library' version '9.0.0' apply false id 'org.jetbrains.kotlin.plugin.compose' version '2.3.0' } diff --git a/tictactoe_kotlin/gradle/wrapper/gradle-wrapper.properties b/tictactoe_kotlin/gradle/wrapper/gradle-wrapper.properties index f8749123..035b1ac3 100644 --- a/tictactoe_kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/tictactoe_kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Jul 22 16:26:03 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists