Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compose-jb 1.2.0 | Compose Compiler 1.3.2 | Kotlin 1.7.20 #806

Merged
merged 1 commit into from Oct 12, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion app-desktop/build.gradle.kts
@@ -1,4 +1,3 @@
import org.jetbrains.compose.compose
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand All @@ -24,6 +23,10 @@ dependencies {
implementation(libs.kotlin.coroutines.core)
}

compose {
kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
}
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Expand Up @@ -8,14 +8,14 @@ targetSdk = "33"
gradleBuild = "7.3.0"
buildTools = "33.0.0"
# kotlin
dokka = "1.7.10"
kotlinCore = { require = "1.7.10" }
dokka = "1.7.20"
kotlinCore = { require = "1.7.20" }
kotlinCoroutines = { require = "1.6.4" }
kotlinxSerialization = "1.4.0"
# compose
compose = "1.2.1"
composeCompiler = "1.3.1"
composejb = "1.2.0-beta01"
composeCompiler = "1.3.2"
composejb = "1.2.0"
# androidx
activity = "1.6.0"
cardview = "1.0.0"
Expand All @@ -28,7 +28,7 @@ recyclerView = "1.2.1"
material = "1.6.1"
# other
accompanist = "0.25.1"
fastAdapter = "5.6.0"
fastAdapter = "5.7.0"
gradleMvnPublish = "0.18.0"
iconics = "5.3.3"
itemAnimators = "1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion multiplatform-demo/gradle.properties
@@ -1,7 +1,7 @@
kotlin.code.style=official
kotlin.version=1.7.10
compose.version=1.2.0-beta01
aboutlibraries.version=10.4.0
aboutlibraries.version=10.5.0

# define the export path for aboutLibraries files
aboutLibraries.exportPath=src/jvmMain/resources/