From 5a00168dd0209e6247d3d4b93533514fb475a460 Mon Sep 17 00:00:00 2001 From: Romain Boisselle Date: Mon, 9 Oct 2023 16:45:49 +0200 Subject: [PATCH] Kotlin 1.9.0 / Compose 1.5.0 --- Readme.adoc | 2 +- build.gradle.kts | 2 +- css-in-composable/build.gradle.kts | 3 +++ gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Readme.adoc b/Readme.adoc index 6e57638..9da9dc8 100644 --- a/Readme.adoc +++ b/Readme.adoc @@ -1,6 +1,6 @@ = Css In Composable :icons: font -:version: 1.4.0 +:version: 1.5.0 This library is meant to be used with https://github.com/JetBrains/compose-multiplatform#compose-html[Compose-HTML]. diff --git a/build.gradle.kts b/build.gradle.kts index c327cfe..b6fbcea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,5 +4,5 @@ plugins { allprojects { group = "org.kodein.compose.html.css" - version = "1.4.0" + version = "1.5.0" } diff --git a/css-in-composable/build.gradle.kts b/css-in-composable/build.gradle.kts index 977399f..fe313b1 100644 --- a/css-in-composable/build.gradle.kts +++ b/css-in-composable/build.gradle.kts @@ -11,6 +11,9 @@ kotlin.kodein { implementation(kotlin.compose.runtime) } } + // NOT USED - Workaround to make Dokka happy in MPP JS Only projects + // https://github.com/Kotlin/dokka/issues/3122 + jvm() } kotlin.sourceSets.all { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d914ca1..3d8350b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -compose = "1.4.0" +compose = "1.5.2" [plugins] compose = { id = "org.jetbrains.compose", version.ref = "compose" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0ad737d..27313fb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 396639e..d440e6f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,7 +4,7 @@ buildscript { maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo") } dependencies { - classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.0.1") + classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.2.2") } }