Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/kotlin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions tictactoe_dart/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand Down
10 changes: 4 additions & 6 deletions tictactoe_kotlin/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.plugin.compose'
}

Expand Down Expand Up @@ -37,9 +36,6 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
buildFeatures {
compose true
}
Expand Down Expand Up @@ -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
}
}
}
5 changes: 2 additions & 3 deletions tictactoe_kotlin/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
2 changes: 1 addition & 1 deletion tictactoe_kotlin/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading