diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4994944..8d6712f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,11 +44,6 @@ jobs: runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v4 - - uses: graalvm/setup-graalvm@v1 - with: - java-version: 17 - distribution: 'graalvm-community' - set-java-home: false - uses: actions/setup-java@v4 with: distribution: 'zulu' diff --git a/.gitignore b/.gitignore index ddd506b..93a2271 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ site/ docs/js/gradient.js docs/js/converter.js kotlin-js-store/ +.kotlin/ diff --git a/build.gradle.kts b/build.gradle.kts index c6d7423..0c0e1c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ plugins { alias(libs.plugins.dokka).apply(false) alias(libs.plugins.publish).apply(false) alias(libs.plugins.jetbrainsCompose).apply(false) + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.kotlinBinaryCompatibilityValidator) } @@ -42,9 +43,6 @@ subprojects { jvmTarget.set(JvmTarget.JVM_1_8) } } - tasks.withType().configureEach { - options.release.set(8) - } plugins.withType().configureEach { configure { diff --git a/extensions/colormath-ext-jetpack-compose/build.gradle.kts b/extensions/colormath-ext-jetpack-compose/build.gradle.kts index 5138746..1f8be91 100644 --- a/extensions/colormath-ext-jetpack-compose/build.gradle.kts +++ b/extensions/colormath-ext-jetpack-compose/build.gradle.kts @@ -1,5 +1,6 @@ import com.vanniktech.maven.publish.tasks.JavadocJar import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension plugins { id("com.android.library") @@ -38,7 +39,6 @@ kotlin { } } -@Suppress("UnstableApiUsage") android { namespace = "com.github.ajalt.colormath.extensions.android.composecolor" compileSdk = 33 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2980bb0..96b3775 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -kotlin = "1.9.21" -compose = "1.6.0" -compose-plugin = "1.6.0" +kotlin = "2.0.0" +compose = "1.6.10" +compose-plugin = "1.6.10" [libraries] @@ -10,9 +10,9 @@ androidx-annotation = "androidx.annotation:annotation:1.7.0" compose-ui-graphics = { module = "org.jetbrains.compose.ui:ui-graphics", version.ref = "compose" } # used in tests -kotest = "io.kotest:kotest-assertions-core:5.8.0" +kotest = "io.kotest:kotest-assertions-core:5.9.0" junit = "junit:junit:4.13.2" -robolectric = "org.robolectric:robolectric:4.10" +robolectric = "org.robolectric:robolectric:4.12.2" # used in samples compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } @@ -21,11 +21,12 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" [plugins] dokka = "org.jetbrains.dokka:1.9.20" -publish = "com.vanniktech.maven.publish:0.27.0" +publish = "com.vanniktech.maven.publish:0.28.0" kotlinBinaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.14.0" # used in extensions -android-library = "com.android.library:7.4.0" +android-library = "com.android.library:8.4.0" # used in samples jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/website/build.gradle.kts b/website/build.gradle.kts index fc60793..f193ca9 100644 --- a/website/build.gradle.kts +++ b/website/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { kotlin("multiplatform") alias(libs.plugins.jetbrainsCompose) + alias(libs.plugins.compose.compiler) } kotlin { @@ -37,7 +38,3 @@ kotlin { } } } - -compose.experimental { - web.application {} -}