Skip to content
Draft
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
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v5
with:
distribution: 'microsoft'
java-version: 21
distribution: 'jetbrains'
java-version: 25

- name: Setup Android SDK
uses: android-actions/setup-android@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
distribution: "jetbrains"
java-version: 21
distribution: 'jetbrains'
java-version: 25
- name: import certs
if: startsWith(github.ref, 'refs/tags/')
uses: apple-actions/import-codesign-certs@v5
Expand Down Expand Up @@ -91,8 +91,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
distribution: "jetbrains"
java-version: 21
distribution: 'jetbrains'
java-version: 25
# Run tests
- name: Run Tests
run: ./gradlew jvmTest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 21
distribution: 'jetbrains'
java-version: 25
# Run tests
- name: Run Tests
run: ./gradlew allTests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
submodules: true

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
distribution: "zulu"
java-version: 21
distribution: 'jetbrains'
java-version: 25

- name: Build
env:
Expand Down
24 changes: 22 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import com.android.build.api.dsl.LibraryExtension
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension

plugins {
Expand Down Expand Up @@ -38,7 +39,10 @@ subprojects {
freeCompilerArgs.addAll(freeArgs)
optIn.addAll(commonOptIn)
}
jvmToolchain(libs.versions.java.get().toInt())
jvmToolchain {
languageVersion = JavaLanguageVersion.of(libs.versions.java.get().toInt())
vendor = JvmVendorSpec.JETBRAINS
}
}
}
plugins.withId("org.jetbrains.kotlin.android") {
Expand All @@ -49,7 +53,23 @@ subprojects {
optIn.addAll(commonOptIn)
jvmTarget.set(JvmTarget.fromTarget(libs.versions.java.get()))
}
jvmToolchain(libs.versions.java.get().toInt())
jvmToolchain {
languageVersion = JavaLanguageVersion.of(libs.versions.java.get().toInt())
vendor = JvmVendorSpec.JETBRAINS
}
}
}
plugins.withId("org.jetbrains.kotlin.jvm") {
extensions.configure<KotlinJvmExtension> {
compilerOptions {
allWarningsAsErrors.set(true)
freeCompilerArgs.addAll(freeArgs)
optIn.addAll(commonOptIn)
}
jvmToolchain {
languageVersion = JavaLanguageVersion.of(libs.versions.java.get().toInt())
vendor = JvmVendorSpec.JETBRAINS
}
}
}

Expand Down
1 change: 1 addition & 0 deletions compose-ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ kotlin {
implementation(libs.fluent.ui)
implementation(libs.koin.compose)
implementation(libs.androidx.collection)
implementation("io.github.kdroidfilter:composemediaplayer:0.8.7")
}
}
val iosMain by getting {
Expand Down
Loading
Loading