Skip to content

Commit 2e5a798

Browse files
terrakokterrakok
committed
Updated Gradle minimal version to 8.0 and Kotlin to 2.2.0-Beta1.
Updated Kotlin language and API versions to 1.8. Updated kotlin-poet to 2.1.0
1 parent 1214640 commit 2e5a798

File tree

27 files changed

+212
-329
lines changed

27 files changed

+212
-329
lines changed

‎.github/workflows/gradle-plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os: [ubuntu-24.04, macos-14, windows-2022]
20-
gradle: [7.4, 8.13]
20+
gradle: [8.0, 8.13]
2121
agp: [8.6.0, 8.9.0]
2222
runs-on: ${{ matrix.os }}
2323
steps:

‎gradle-plugins/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ subprojects {
3434
compilerOptions {
3535
// must be set to a language version of the kotlin compiler & runtime,
3636
// which is bundled to the oldest supported Gradle
37-
languageVersion.set(KotlinVersion.KOTLIN_1_6)
38-
apiVersion.set(KotlinVersion.KOTLIN_1_6)
37+
// https://docs.gradle.org/current/userguide/compatibility.html#kotlin
38+
languageVersion.set(KotlinVersion.KOTLIN_1_8)
39+
apiVersion.set(KotlinVersion.KOTLIN_1_8)
3940
jvmTarget.set(JvmTarget.JVM_11)
4041
}
4142
}

‎gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/androidMainResourceAccessors/my/lib/res/String0.androidMain.kt‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import org.jetbrains.compose.resources.InternalResourceApi
99
import org.jetbrains.compose.resources.StringResource
1010

1111
private object AndroidMainString0 {
12-
public val android_str: StringResource by
13-
lazy { init_android_str() }
12+
public val android_str: StringResource by
13+
lazy { init_android_str() }
1414
}
1515

1616
@InternalResourceApi
@@ -23,8 +23,7 @@ public val Res.string.android_str: StringResource
2323

2424
private fun init_android_str(): StringResource = org.jetbrains.compose.resources.StringResource(
2525
"string:android_str", "android_str",
26-
setOf(
27-
org.jetbrains.compose.resources.ResourceItem(setOf(),
28-
"composeResources/my.lib.res/values/strings.androidMain.cvr", 10, 39),
29-
)
30-
)
26+
setOf(
27+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/values/strings.androidMain.cvr", 10, 39),
28+
)
29+
)

‎gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/androidMainResourceCollectors/my/lib/res/ActualResourceCollectors.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,26 @@ public actual val Res.allDrawableResources: Map<String, DrawableResource> by laz
1717
return@lazy map
1818
}
1919

20-
2120
public actual val Res.allStringResources: Map<String, StringResource> by lazy {
2221
val map = mutableMapOf<String, StringResource>()
2322
_collectAndroidMainString0Resources(map)
2423
_collectCommonMainString0Resources(map)
2524
return@lazy map
2625
}
2726

28-
2927
public actual val Res.allStringArrayResources: Map<String, StringArrayResource> by lazy {
3028
val map = mutableMapOf<String, StringArrayResource>()
3129
return@lazy map
3230
}
3331

34-
3532
public actual val Res.allPluralStringResources: Map<String, PluralStringResource> by lazy {
3633
val map = mutableMapOf<String, PluralStringResource>()
3734
_collectCommonMainPlurals0Resources(map)
3835
return@lazy map
3936
}
4037

41-
4238
public actual val Res.allFontResources: Map<String, FontResource> by lazy {
4339
val map = mutableMapOf<String, FontResource>()
4440
_collectCommonMainFont0Resources(map)
4541
return@lazy map
46-
}
47-
42+
}

‎gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/commonMainResourceAccessors/my/lib/res/Drawable0.commonMain.kt‎

Lines changed: 32 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ import org.jetbrains.compose.resources.DrawableResource
99
import org.jetbrains.compose.resources.InternalResourceApi
1010

1111
private object CommonMainDrawable0 {
12-
public val _3_strange_name: DrawableResource by
13-
lazy { init__3_strange_name() }
12+
public val _3_strange_name: DrawableResource by
13+
lazy { init__3_strange_name() }
1414

15-
public val camelCaseName: DrawableResource by
16-
lazy { init_camelCaseName() }
15+
public val camelCaseName: DrawableResource by
16+
lazy { init_camelCaseName() }
1717

18-
public val `is`: DrawableResource by
19-
lazy { init_is() }
18+
public val `is`: DrawableResource by
19+
lazy { init_is() }
2020

21-
public val vector: DrawableResource by
22-
lazy { init_vector() }
21+
public val vector: DrawableResource by
22+
lazy { init_vector() }
2323

24-
public val vector_2: DrawableResource by
25-
lazy { init_vector_2() }
24+
public val vector_2: DrawableResource by
25+
lazy { init_vector_2() }
2626
}
2727

2828
@InternalResourceApi
@@ -37,70 +37,53 @@ internal fun _collectCommonMainDrawable0Resources(map: MutableMap<String, Drawab
3737
public val Res.drawable._3_strange_name: DrawableResource
3838
get() = CommonMainDrawable0._3_strange_name
3939

40-
private fun init__3_strange_name(): DrawableResource =
41-
org.jetbrains.compose.resources.DrawableResource(
40+
private fun init__3_strange_name(): DrawableResource = org.jetbrains.compose.resources.DrawableResource(
4241
"drawable:_3_strange_name",
43-
setOf(
44-
org.jetbrains.compose.resources.ResourceItem(setOf(),
45-
"composeResources/my.lib.res/drawable/3-strange-name.xml", -1, -1),
46-
)
42+
setOf(
43+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/drawable/3-strange-name.xml", -1, -1),
44+
)
4745
)
4846

4947
public val Res.drawable.camelCaseName: DrawableResource
5048
get() = CommonMainDrawable0.camelCaseName
5149

52-
private fun init_camelCaseName(): DrawableResource =
53-
org.jetbrains.compose.resources.DrawableResource(
50+
private fun init_camelCaseName(): DrawableResource = org.jetbrains.compose.resources.DrawableResource(
5451
"drawable:camelCaseName",
55-
setOf(
56-
org.jetbrains.compose.resources.ResourceItem(setOf(),
57-
"composeResources/my.lib.res/drawable/camelCaseName.xml", -1, -1),
58-
)
52+
setOf(
53+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/drawable/camelCaseName.xml", -1, -1),
54+
)
5955
)
6056

6157
public val Res.drawable.`is`: DrawableResource
6258
get() = CommonMainDrawable0.`is`
6359

6460
private fun init_is(): DrawableResource = org.jetbrains.compose.resources.DrawableResource(
6561
"drawable:is",
66-
setOf(
67-
org.jetbrains.compose.resources.ResourceItem(setOf(),
68-
"composeResources/my.lib.res/drawable/is.xml", -1, -1),
69-
)
62+
setOf(
63+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/drawable/is.xml", -1, -1),
64+
)
7065
)
7166

7267
public val Res.drawable.vector: DrawableResource
7368
get() = CommonMainDrawable0.vector
7469

7570
private fun init_vector(): DrawableResource = org.jetbrains.compose.resources.DrawableResource(
7671
"drawable:vector",
77-
setOf(
78-
79-
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("ast"),
80-
), "composeResources/my.lib.res/drawable-ast/vector.xml", -1, -1),
81-
82-
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("au"),
83-
org.jetbrains.compose.resources.RegionQualifier("US"), ),
84-
"composeResources/my.lib.res/drawable-au-rUS/vector.xml", -1, -1),
85-
86-
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.ThemeQualifier.DARK,
87-
org.jetbrains.compose.resources.LanguageQualifier("ge"), ),
88-
"composeResources/my.lib.res/drawable-dark-ge/vector.xml", -1, -1),
89-
90-
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"),
91-
), "composeResources/my.lib.res/drawable-en/vector.xml", -1, -1),
92-
org.jetbrains.compose.resources.ResourceItem(setOf(),
93-
"composeResources/my.lib.res/drawable/vector.xml", -1, -1),
94-
)
72+
setOf(
73+
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("ast"), ), "composeResources/my.lib.res/drawable-ast/vector.xml", -1, -1),
74+
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("au"), org.jetbrains.compose.resources.RegionQualifier("US"), ), "composeResources/my.lib.res/drawable-au-rUS/vector.xml", -1, -1),
75+
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.ThemeQualifier.DARK, org.jetbrains.compose.resources.LanguageQualifier("ge"), ), "composeResources/my.lib.res/drawable-dark-ge/vector.xml", -1, -1),
76+
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"), ), "composeResources/my.lib.res/drawable-en/vector.xml", -1, -1),
77+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/drawable/vector.xml", -1, -1),
78+
)
9579
)
9680

9781
public val Res.drawable.vector_2: DrawableResource
9882
get() = CommonMainDrawable0.vector_2
9983

10084
private fun init_vector_2(): DrawableResource = org.jetbrains.compose.resources.DrawableResource(
10185
"drawable:vector_2",
102-
setOf(
103-
org.jetbrains.compose.resources.ResourceItem(setOf(),
104-
"composeResources/my.lib.res/drawable/vector_2.xml", -1, -1),
105-
)
106-
)
86+
setOf(
87+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/drawable/vector_2.xml", -1, -1),
88+
)
89+
)

‎gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/commonMainResourceAccessors/my/lib/res/Font0.commonMain.kt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import org.jetbrains.compose.resources.FontResource
99
import org.jetbrains.compose.resources.InternalResourceApi
1010

1111
private object CommonMainFont0 {
12-
public val emptyFont: FontResource by
13-
lazy { init_emptyFont() }
12+
public val emptyFont: FontResource by
13+
lazy { init_emptyFont() }
1414
}
1515

1616
@InternalResourceApi
@@ -23,11 +23,8 @@ public val Res.font.emptyFont: FontResource
2323

2424
private fun init_emptyFont(): FontResource = org.jetbrains.compose.resources.FontResource(
2525
"font:emptyFont",
26-
setOf(
27-
28-
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"),
29-
), "composeResources/my.lib.res/font-en/emptyFont.otf", -1, -1),
30-
org.jetbrains.compose.resources.ResourceItem(setOf(),
31-
"composeResources/my.lib.res/font/emptyFont.otf", -1, -1),
32-
)
33-
)
26+
setOf(
27+
org.jetbrains.compose.resources.ResourceItem(setOf(org.jetbrains.compose.resources.LanguageQualifier("en"), ), "composeResources/my.lib.res/font-en/emptyFont.otf", -1, -1),
28+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/font/emptyFont.otf", -1, -1),
29+
)
30+
)

‎gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/commonMainResourceAccessors/my/lib/res/Plurals0.commonMain.kt‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,21 @@ import org.jetbrains.compose.resources.InternalResourceApi
99
import org.jetbrains.compose.resources.PluralStringResource
1010

1111
private object CommonMainPlurals0 {
12-
public val numberOfSongsAvailable: PluralStringResource by
13-
lazy { init_numberOfSongsAvailable() }
12+
public val numberOfSongsAvailable: PluralStringResource by
13+
lazy { init_numberOfSongsAvailable() }
1414
}
1515

1616
@InternalResourceApi
1717
internal fun _collectCommonMainPlurals0Resources(map: MutableMap<String, PluralStringResource>) {
18-
map.put("numberOfSongsAvailable", CommonMainPlurals0.numberOfSongsAvailable)
18+
map.put("numberOfSongsAvailable", CommonMainPlurals0.numberOfSongsAvailable)
1919
}
2020

2121
public val Res.plurals.numberOfSongsAvailable: PluralStringResource
22-
get() = CommonMainPlurals0.numberOfSongsAvailable
22+
get() = CommonMainPlurals0.numberOfSongsAvailable
2323

24-
private fun init_numberOfSongsAvailable(): PluralStringResource =
25-
org.jetbrains.compose.resources.PluralStringResource(
26-
"plurals:numberOfSongsAvailable", "numberOfSongsAvailable",
24+
private fun init_numberOfSongsAvailable(): PluralStringResource = org.jetbrains.compose.resources.PluralStringResource(
25+
"plurals:numberOfSongsAvailable", "numberOfSongsAvailable",
2726
setOf(
28-
org.jetbrains.compose.resources.ResourceItem(setOf(),
29-
"composeResources/my.lib.res/values/strings.commonMain.cvr", 10, 124),
27+
org.jetbrains.compose.resources.ResourceItem(setOf(), "composeResources/my.lib.res/values/strings.commonMain.cvr", 10, 124),
3028
)
31-
)
29+
)

0 commit comments

Comments
 (0)