Skip to content

Commit 456a119

Browse files
Update gradle version and all libraries
1 parent 56db285 commit 456a119

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

.github/workflows/kotlin.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ jobs:
2323
distribution: 'oracle' # See 'Supported distributions' for available options
2424
java-version: '21'
2525
cache: 'gradle'
26-
- name: Setup Gradle 8.13
26+
- name: Setup Gradle
2727
uses: gradle/actions/setup-gradle@v5
28-
with:
29-
gradle-version: 8.13
3028
- name: Make gradle executable
3129
run: chmod +x ./gradlew
3230

@@ -69,10 +67,8 @@ jobs:
6967
java-version: 21
7068
distribution: 'oracle'
7169
cache: 'gradle'
72-
- name: Setup Gradle 8.13
70+
- name: Setup Gradle
7371
uses: gradle/actions/setup-gradle@v5
74-
with:
75-
gradle-version: 8.13
7672
- name: Make gradle executable
7773
run: chmod +x ./gradlew
7874
- name: Enable KVM group perms

tictactoe_dart/android/app/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ android {
3535
targetCompatibility JavaVersion.VERSION_1_8
3636
}
3737

38-
kotlinOptions {
39-
jvmTarget = '1.8'
40-
}
41-
4238
sourceSets {
4339
main.java.srcDirs += 'src/main/kotlin'
4440
}

tictactoe_kotlin/app/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
id 'com.android.application'
3-
id 'org.jetbrains.kotlin.android'
43
id 'org.jetbrains.kotlin.plugin.compose'
54
}
65

@@ -37,9 +36,6 @@ android {
3736
sourceCompatibility JavaVersion.VERSION_1_8
3837
targetCompatibility JavaVersion.VERSION_1_8
3938
}
40-
kotlinOptions {
41-
jvmTarget = '1.8'
42-
}
4339
buildFeatures {
4440
compose true
4541
}
@@ -74,7 +70,9 @@ dependencies {
7470
debugImplementation 'androidx.tracing:tracing:1.3.0'
7571
}
7672
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
77-
kotlinOptions {
78-
languageVersion = "2.0"
73+
kotlin {
74+
compilerOptions {
75+
languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
76+
}
7977
}
8078
}

tictactoe_kotlin/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '8.13.2' apply false
3+
id 'com.android.application' version '9.0.0' apply false
44
id 'com.android.library' version '9.0.0' apply false
5-
id 'org.jetbrains.kotlin.android' version '2.3.0' apply false
65
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.0'
76
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sat Jul 22 16:26:03 CEST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)