Skip to content

Commit 594df0a

Browse files
jakub-senohrabekintellij-monorepo-bot
jakub-senohrabek
authored and
intellij-monorepo-bot
committed
[jewel] JEWEL-725 Upgrade Compose to 1.8.0-alpha04
closes #2927 GitOrigin-RevId: 86371b242ca832f4f8cacf70e5e22e003f46f8de
1 parent 2b33edc commit 594df0a

23 files changed

+689
-3698
lines changed

‎.idea/modules.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎libraries/compose-foundation-desktop-junit/BUILD.bazel

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
### auto-generated section `build intellij.libraries.compose.foundation.desktop` start
2+
load("@rules_java//java:defs.bzl", "java_library")
3+
load("@rules_jvm//:jvm.bzl", "jvm_resources")
4+
5+
jvm_resources(
6+
name = "compose-foundation-desktop-junit_resources",
7+
files = glob(["resources/**/*"]),
8+
strip_prefix = "resources"
9+
)
10+
11+
java_library(
12+
name = "compose-foundation-desktop-junit",
13+
visibility = ["//visibility:public"],
14+
exports = ["@lib//:libraries-compose-foundation-desktop-compose-foundation-desktop-junit"],
15+
runtime_deps = [
16+
":compose-foundation-desktop_resources",
17+
"//libraries/skiko",
18+
"@lib//:libraries-compose-foundation-desktop-compose-foundation-desktop-junit",
19+
]
20+
)
21+
### auto-generated section `build intellij.libraries.compose.foundation.desktop.junit` end

‎libraries/compose-foundation-desktop-junit/intellij.libraries.compose.foundation.desktop.junit.iml

+321
Large diffs are not rendered by default.

‎libraries/compose-foundation-desktop-junit/resources/intellij.libraries.compose.foundation.desktop.junit.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<idea-plugin>
2+
<dependencies>
3+
<module name="intellij.libraries.skiko" />
4+
<module name="intellij.libraries.compose.foundation.desktop" />
5+
</dependencies>
6+
</idea-plugin>

‎libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml

+122-79
Large diffs are not rendered by default.

‎libraries/skiko/intellij.libraries.skiko.iml

+15-13
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,40 @@
88
<orderEntry type="inheritedJdk" />
99
<orderEntry type="sourceFolder" forTests="false" />
1010
<orderEntry type="module-library" exported="">
11-
<library name="jetbrains.skiko.awt.runtime.all" type="repository">
12-
<properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt-runtime-all:0.8.18">
11+
<library name="jetbrains.skiko.awt.compose" type="repository">
12+
<properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt:0.9.2">
1313
<verification>
14-
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.18/skiko-awt-runtime-all-0.8.18.jar">
15-
<sha256sum>3b50eeef280bf673bcd02cbb2ea9d3e43d88f87f2d51409cc84d99453896629c</sha256sum>
14+
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.9.2/skiko-awt-0.9.2.jar">
15+
<sha256sum>e1f815f44f5dafcf12f673cda3355ae59c39754bf99f3b11f6d00fd700156148</sha256sum>
1616
</artifact>
1717
</verification>
1818
</properties>
1919
<CLASSES>
20-
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.18/skiko-awt-runtime-all-0.8.18.jar!/" />
20+
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.9.2/skiko-awt-0.9.2.jar!/" />
2121
</CLASSES>
22-
<JAVADOC />
22+
<JAVADOC>
23+
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.9.2/skiko-awt-0.9.2-javadoc.jar!/" />
24+
</JAVADOC>
2325
<SOURCES>
24-
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.18/skiko-awt-runtime-all-0.8.18-sources.jar!/" />
26+
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.9.2/skiko-awt-0.9.2-sources.jar!/" />
2527
</SOURCES>
2628
</library>
2729
</orderEntry>
2830
<orderEntry type="module-library" exported="">
29-
<library name="jetbrains.skiko.awt.compose" type="repository">
30-
<properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt:0.8.18">
31+
<library name="jetbrains.skiko.awt.runtime.all" type="repository">
32+
<properties maven-id="org.jetbrains.skiko:skiko-awt-runtime-all:0.9.2">
3133
<verification>
32-
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.18/skiko-awt-0.8.18.jar">
33-
<sha256sum>637f5de1a208f1368ac51b5a286a4827cec828cd62dda332dc3400b8543e243d</sha256sum>
34+
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.9.2/skiko-awt-runtime-all-0.9.2.jar">
35+
<sha256sum>f4077aabec7cd2af8d330b0bac1b69e0556dfcb6fbedf1370cfbf0e0d8177f15</sha256sum>
3436
</artifact>
3537
</verification>
3638
</properties>
3739
<CLASSES>
38-
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.18/skiko-awt-0.8.18.jar!/" />
40+
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.9.2/skiko-awt-runtime-all-0.9.2.jar!/" />
3941
</CLASSES>
4042
<JAVADOC />
4143
<SOURCES>
42-
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.18/skiko-awt-0.8.18-sources.jar!/" />
44+
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.9.2/skiko-awt-runtime-all-0.9.2-sources.jar!/" />
4345
</SOURCES>
4446
</library>
4547
</orderEntry>

‎platform/jewel/build.gradle.kts

-22
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,7 @@ dependencies {
2222
sarif(projects.ui)
2323
}
2424

25-
// TODO remove this once the Skiko fix makes it into CMP 1.7.1
26-
allprojects {
27-
configurations.all {
28-
resolutionStrategy {
29-
eachDependency {
30-
if (requested.group == "org.jetbrains.skiko") {
31-
useVersion("0.8.17")
32-
because("Contains important memory usage fix")
33-
}
34-
}
35-
}
36-
}
37-
}
38-
3925
tasks {
40-
// val mergeSarifReports by
41-
// registering(MergeSarifTask::class) {
42-
// source(configurations.outgoingSarif)
43-
// include { it.file.extension == "sarif" }
44-
// }
45-
//
46-
// register("check") { dependsOn(mergeSarifReports) }
47-
4826
register("tagRelease") {
4927
description = "Tags main branch and releases branches with provided tag name"
5028
group = "release"

‎platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ apiValidation {
1515
nonPublicMarkers.add("org.jetbrains.jewel.InternalJewelApi")
1616
}
1717

18-
kotlin { explicitApi() }
18+
kotlin { compilerOptions { freeCompilerArgs.add("-Xexplicit-api=strict") } }
1919

2020
val extension = project.extensions.create("publicApiValidation", ApiValidationExtension::class.java)
2121

‎platform/jewel/buildSrc/src/main/kotlin/jewel.gradle.kts

+13-13
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ val jdkLevel = project.property("jdk.level") as String
4040
kotlin {
4141
jvmToolchain { languageVersion = JavaLanguageVersion.of(jdkLevel) }
4242

43-
compilerOptions.jvmTarget.set(JvmTarget.fromTarget(jdkLevel))
44-
45-
target {
46-
compilations.all { kotlinOptions { freeCompilerArgs += "-Xcontext-receivers" } }
47-
sourceSets.all {
48-
languageSettings {
49-
optIn("androidx.compose.foundation.ExperimentalFoundationApi")
50-
optIn("androidx.compose.ui.ExperimentalComposeUiApi")
51-
optIn("kotlin.experimental.ExperimentalTypeInference")
52-
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
53-
optIn("org.jetbrains.jewel.foundation.ExperimentalJewelApi")
54-
optIn("org.jetbrains.jewel.foundation.InternalJewelApi")
55-
}
43+
compilerOptions {
44+
freeCompilerArgs.add("-Xcontext-receivers")
45+
jvmTarget.set(JvmTarget.fromTarget(jdkLevel))
46+
}
47+
48+
sourceSets.all {
49+
languageSettings {
50+
optIn("androidx.compose.foundation.ExperimentalFoundationApi")
51+
optIn("androidx.compose.ui.ExperimentalComposeUiApi")
52+
optIn("kotlin.experimental.ExperimentalTypeInference")
53+
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
54+
optIn("org.jetbrains.jewel.foundation.ExperimentalJewelApi")
55+
optIn("org.jetbrains.jewel.foundation.InternalJewelApi")
5656
}
5757
}
5858
}

0 commit comments

Comments
 (0)