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.

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

Jump to bottom

update compose compiler version to 1.5.13 #4770

Merged
merged 4 commits into from
May 7, 2024
Merged

update compose compiler version to 1.5.13 #4770

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3076479
update compose compiler version to 1.5.12
shishkin-pavel May 7, 2024
93020c3
kotlin and compose version bump
shishkin-pavel May 7, 2024
8158617
update to ver 1.5.13
shishkin-pavel May 7, 2024
1312c5b
update compiler version for k1.9.24
shishkin-pavel May 7, 2024
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
6 changes: 3 additions & 3 deletions compose/integrations/composable-test-cases/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m
kotlin.code.style=official
android.useAndroidX=true
kotlin.version=1.9.23
kotlin.version=1.9.24
agp.version=7.3.0

# a version of compose libraries. In this project the only dependency is compose-runtime.
compose.version=1.6.1
compose.version=1.6.10-rc01
# a group id for compose-runtime. Keep it as a parameter to easily change it on CI.
compose.runtime.groupId=org.jetbrains.compose.runtime

kotlinx.coroutines.version=1.8.0

#empty by default - a default version will be used
#compose.kotlinCompilerPluginVersion=23.12.18
compose.kotlinCompilerPluginVersion=1.5.10.2
compose.kotlinCompilerPluginVersion=1.5.12

# default|failingJs - see enum class CasesToRun
tests.casesToRun=default
Expand Down
3 changes: 2 additions & 1 deletion gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ internal object ComposeCompilerCompatibility {
"1.9.20" to "1.5.3",
"1.9.21" to "1.5.4",
"1.9.22" to "1.5.8.1",
"1.9.23" to "1.5.10.2",
"1.9.23" to "1.5.12",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it expected that 1.5.12 will be used for kotlin 1.9.23? Or is it an accidental change?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jetpack compose 1.5.12 is compatible with 1.9.23, so it is probably a good thing to have our 1.5.12 compatible with it also
https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
also, Ive noted that 1.5.13 is up, so probably we should abandon these pulls and support 1.5.13 for both 1.9.23 and 1.9.24?

"1.9.24" to "1.5.12",
"2.0.0-Beta1" to "1.5.4-dev1-kt2.0.0-Beta1",
"2.0.0-Beta4" to "1.5.9-kt-2.0.0-Beta4",
"2.0.0-Beta5" to "1.5.11-kt-2.0.0-Beta5",
Expand Down
6 changes: 3 additions & 3 deletions gradle-plugins/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ dev.junit.parallel=false
# Default version of Compose Libraries used by Gradle plugin
compose.version=1.6.10-dev1590
# The latest version of Compose Compiler used by Gradle plugin. Used only in tests/CI.
compose.tests.compiler.version=1.5.10.2
compose.tests.compiler.version=1.5.12
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
compose.tests.compiler.compatible.kotlin.version=1.9.23
compose.tests.compiler.compatible.kotlin.version=1.9.24
# The latest version of Kotlin compatible with compose.tests.compiler.version for JS target. Used only on CI.
compose.tests.js.compiler.compatible.kotlin.version=1.9.23
compose.tests.js.compiler.compatible.kotlin.version=1.9.24
# __SUPPORTED_GRADLE_VERSIONS__
# Don't forget to edit versions in .github/workflows/gradle-plugin.yml as well
# and Publish.Subtasks.buildTypes.gradle.GradlePluginTestKt#gradleVersions in the TC config
Expand Down