Skip to content

Update compose and kotlin versions in compose examples #34

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Update compose and kotlin versions in compose examples #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf901fe
Update compose and kotlin versions in compose examples
eymar Nov 3, 2023
6fc3096
Remove outdated workaround
eymar Nov 3, 2023
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
17 changes: 0 additions & 17 deletions compose-imageviewer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,6 @@ allprojects {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
}

configurations.all {
val conf = this
// Currently it's necessary to make the android build work properly
conf.resolutionStrategy.eachDependency {
if (requested.module.name.startsWith("kotlin-stdlib")) {
val kotlinVersion = project.property("kotlin.version") as String
useVersion(kotlinVersion)
}
if (requested.module.name.contains("kotlinx-serialization") &&
// kotlinx-datetime-wasm-js:0.4.1-wasm0 depends on outdated kotlinx-serialization-core:1.5.2-wasm0
requested.version == "1.5.2-wasm0"
) {
useVersion("1.6.1-wasm0")
}
}
}

afterEvaluate {
extensions.findByType(ComposeExtension::class.java)?.apply {
val composeCompilerVersion = project.property("compose.compiler.version") as String
Expand Down
6 changes: 3 additions & 3 deletions compose-imageviewer/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ kotlin.native.binary.memoryModel=experimental
agp.version=7.1.3
ktor.version=2.2.1
kotlin.js.ir.output.granularity=whole-program
compose.compiler.version=1.5.2.1-rc01
compose.wasm.version=1.5.10-dev-wasm01
kotlin.version=1.9.20-RC
compose.compiler.version=1.5.3
compose.wasm.version=1.5.10-dev-wasm02
kotlin.version=1.9.20

# To enable K2 Kotlin compiler uncomment the next line
#kotlin.experimental.tryK2=true
16 changes: 0 additions & 16 deletions compose-jetsnack/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,6 @@ allprojects {
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
}

configurations.all {
val conf = this
conf.resolutionStrategy.eachDependency {
if (requested.module.name.startsWith("kotlin-stdlib")) {
val kotlinVersion = project.property("kotlin.version") as String
useVersion(kotlinVersion)
}
if (requested.module.name.contains("kotlinx-serialization") &&
// kotlinx-datetime-wasm-js:0.4.1-wasm0 depends on outdated kotlinx-serialization-core:1.5.2-wasm0
requested.version == "1.5.2-wasm0"
) {
useVersion("1.6.1-wasm0")
}
}
}

afterEvaluate {
extensions.findByType(ComposeExtension::class.java)?.apply {
val composeCompilerVersion = project.property("compose.compiler.version") as String
Expand Down
6 changes: 3 additions & 3 deletions compose-jetsnack/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ org.gradle.jvmargs=-Xmx3g
kotlin.code.style=official
android.useAndroidX=true
agp.version=7.3.0
compose.compiler.version=1.5.2.1-rc01
compose.wasm.version=1.5.10-dev-wasm01
kotlin.version=1.9.20-RC
compose.compiler.version=1.5.3
compose.wasm.version=1.5.10-dev-wasm02
kotlin.version=1.9.20

# To enable K2 Kotlin compiler uncomment the next line
#kotlin.experimental.tryK2=true