Skip to content

Commit ffd1d57

Browse files
pjBoomspjBooms
committed
Use misc/CommonResources for testGeneratedAccessorsAnnotatedWithResourceContentHash
1 parent 227d3ba commit ffd1d57

18 files changed

Lines changed: 211 additions & 100 deletions

File tree

‎gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,12 +579,12 @@ class ResourcesTest : GradlePluginTestBase() {
579579
}
580580

581581
@Test
582-
fun testGeneratedAccessorsAnnotatedWithResourceContentHash(): Unit = with(testProject("misc/commonResourcesAnnotatedWithResourceContentHash")) {
582+
fun testGeneratedAccessorsAnnotatedWithResourceContentHash(): Unit = with(testProject("misc/commonResources")) {
583583
//check generated resource's accessors
584584
gradle("prepareKotlinIdeaImport", "-Dcompose.resources.generate.ResourceContentHash.annotation=true").checks {
585585
assertDirectoriesContentEquals(
586586
file("build/generated/compose/resourceGenerator/kotlin"),
587-
file("expected")
587+
file("expected-annotated-with-resource-content-hash")
588588
)
589589
}
590590
}

gradle-plugins/compose/src/test/test-projects/misc/commonResourcesAnnotatedWithResourceContentHash/expected/commonMainResourceAccessors/app/group/resources_test/generated/resources/String0.commonMain.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/androidMainResourceAccessors/app/group/resources_test/generated/resources/String0.androidMain.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import org.jetbrains.compose.resources.StringResource
1212

1313
private const val MD: String = "composeResources/app.group.resources_test.generated.resources/"
1414

15-
@delegate:ResourceContentHash(64_828_505)
16-
internal val Res.string.app_name: StringResource by lazy {
17-
StringResource("string:app_name", "app_name", setOf(
18-
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 45, 44),
15+
@delegate:ResourceContentHash(50_967_853)
16+
internal val Res.string.android_str: StringResource by lazy {
17+
StringResource("string:android_str", "android_str", setOf(
18+
ResourceItem(setOf(), "${MD}values/strings.androidMain.cvr", 10, 39),
1919
))
2020
}
2121

2222
@InternalResourceApi
23-
internal fun _collectCommonMainString0Resources(map: MutableMap<String, StringResource>) {
24-
map.put("app_name", Res.string.app_name)
23+
internal fun _collectAndroidMainString0Resources(map: MutableMap<String, StringResource>) {
24+
map.put("android_str", Res.string.android_str)
2525
}

gradle-plugins/compose/src/test/test-projects/misc/commonResourcesAnnotatedWithResourceContentHash/expected/desktopMainResourceCollectors/app/group/resources_test/generated/resources/ActualResourceCollectors.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/androidMainResourceCollectors/app/group/resources_test/generated/resources/ActualResourceCollectors.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ internal actual val Res.allDrawableResources: Map<String, DrawableResource> by l
1919

2020
internal actual val Res.allStringResources: Map<String, StringResource> by lazy {
2121
val map = mutableMapOf<String, StringResource>()
22+
_collectAndroidMainString0Resources(map)
2223
_collectCommonMainString0Resources(map)
2324
return@lazy map
2425
}

‎gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/commonMainResourceAccessors/app/group/resources_test/generated/resources/Drawable0.commonMain.kt‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
@file:OptIn(InternalResourceApi::class)
2+
3+
package app.group.resources_test.generated.resources
4+
5+
import kotlin.OptIn
6+
import kotlin.String
7+
import kotlin.collections.MutableMap
8+
import org.jetbrains.compose.resources.DrawableResource
9+
import org.jetbrains.compose.resources.InternalResourceApi
10+
import org.jetbrains.compose.resources.LanguageQualifier
11+
import org.jetbrains.compose.resources.RegionQualifier
12+
import org.jetbrains.compose.resources.ResourceContentHash
13+
import org.jetbrains.compose.resources.ResourceItem
14+
import org.jetbrains.compose.resources.ThemeQualifier
15+
16+
private const val MD: String = "composeResources/app.group.resources_test.generated.resources/"
17+
18+
@delegate:ResourceContentHash(1_620_038_668)
19+
internal val Res.drawable._3_strange_name: DrawableResource by lazy {
20+
DrawableResource("drawable:_3_strange_name", setOf(
21+
ResourceItem(setOf(), "${MD}drawable/3-strange-name.xml", -1, -1),
22+
))
23+
}
24+
25+
@delegate:ResourceContentHash(1_620_038_668)
26+
internal val Res.drawable.camelCaseName: DrawableResource by lazy {
27+
DrawableResource("drawable:camelCaseName", setOf(
28+
ResourceItem(setOf(), "${MD}drawable/camelCaseName.xml", -1, -1),
29+
))
30+
}
31+
32+
@delegate:ResourceContentHash(1_620_038_668)
33+
internal val Res.drawable.`is`: DrawableResource by lazy {
34+
DrawableResource("drawable:is", setOf(
35+
ResourceItem(setOf(), "${MD}drawable/is.xml", -1, -1),
36+
))
37+
}
38+
39+
@delegate:ResourceContentHash(-1_131_835_124)
40+
internal val Res.drawable.vector: DrawableResource by lazy {
41+
DrawableResource("drawable:vector", setOf(
42+
ResourceItem(setOf(LanguageQualifier("ast"), ), "${MD}drawable-ast/vector.xml", -1, -1),
43+
ResourceItem(setOf(LanguageQualifier("au"), RegionQualifier("US"), ), "${MD}drawable-au-rUS/vector.xml", -1, -1),
44+
ResourceItem(setOf(ThemeQualifier.DARK, LanguageQualifier("ge"), ), "${MD}drawable-dark-ge/vector.xml", -1, -1),
45+
ResourceItem(setOf(LanguageQualifier("en"), ), "${MD}drawable-en/vector.xml", -1, -1),
46+
ResourceItem(setOf(), "${MD}drawable/vector.xml", -1, -1),
47+
))
48+
}
49+
50+
@delegate:ResourceContentHash(1_620_038_668)
51+
internal val Res.drawable.vector_2: DrawableResource by lazy {
52+
DrawableResource("drawable:vector_2", setOf(
53+
ResourceItem(setOf(), "${MD}drawable/vector_2.xml", -1, -1),
54+
))
55+
}
56+
57+
@InternalResourceApi
58+
internal fun _collectCommonMainDrawable0Resources(map: MutableMap<String, DrawableResource>) {
59+
map.put("_3_strange_name", Res.drawable._3_strange_name)
60+
map.put("camelCaseName", Res.drawable.camelCaseName)
61+
map.put("is", Res.drawable.`is`)
62+
map.put("vector", Res.drawable.vector)
63+
map.put("vector_2", Res.drawable.vector_2)
64+
}

gradle-plugins/compose/src/test/test-projects/misc/commonResourcesAnnotatedWithResourceContentHash/expected/commonMainResourceAccessors/app/group/resources_test/generated/resources/Font0.commonMain.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/commonMainResourceAccessors/app/group/resources_test/generated/resources/Font0.commonMain.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ import kotlin.String
77
import kotlin.collections.MutableMap
88
import org.jetbrains.compose.resources.FontResource
99
import org.jetbrains.compose.resources.InternalResourceApi
10+
import org.jetbrains.compose.resources.LanguageQualifier
1011
import org.jetbrains.compose.resources.ResourceContentHash
1112
import org.jetbrains.compose.resources.ResourceItem
1213

1314
private const val MD: String = "composeResources/app.group.resources_test.generated.resources/"
1415

15-
@delegate:ResourceContentHash(1_132_920_421)
16+
@delegate:ResourceContentHash(1_893_715_104)
1617
internal val Res.font.emptyFont: FontResource by lazy {
1718
FontResource("font:emptyFont", setOf(
19+
ResourceItem(setOf(LanguageQualifier("en"), ), "${MD}font-en/emptyFont.otf", -1, -1),
1820
ResourceItem(setOf(), "${MD}font/emptyFont.otf", -1, -1),
1921
))
2022
}

gradle-plugins/compose/src/test/test-projects/misc/commonResourcesAnnotatedWithResourceContentHash/expected/commonMainResourceAccessors/app/group/resources_test/generated/resources/Plurals0.commonMain.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/commonMainResourceAccessors/app/group/resources_test/generated/resources/Plurals0.commonMain.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import org.jetbrains.compose.resources.ResourceItem
1212

1313
private const val MD: String = "composeResources/app.group.resources_test.generated.resources/"
1414

15-
@delegate:ResourceContentHash(-759_003_763)
16-
internal val Res.plurals.plurals: PluralStringResource by lazy {
17-
PluralStringResource("plurals:plurals", "plurals", setOf(
18-
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 10, 34),
15+
@delegate:ResourceContentHash(-199_361_196)
16+
internal val Res.plurals.numberOfSongsAvailable: PluralStringResource by lazy {
17+
PluralStringResource("plurals:numberOfSongsAvailable", "numberOfSongsAvailable", setOf(
18+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 10, 124),
1919
))
2020
}
2121

2222
@InternalResourceApi
2323
internal fun _collectCommonMainPlurals0Resources(map: MutableMap<String, PluralStringResource>) {
24-
map.put("plurals", Res.plurals.plurals)
24+
map.put("numberOfSongsAvailable", Res.plurals.numberOfSongsAvailable)
2525
}

‎gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/commonMainResourceAccessors/app/group/resources_test/generated/resources/String0.commonMain.kt‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
@file:OptIn(InternalResourceApi::class)
2+
3+
package app.group.resources_test.generated.resources
4+
5+
import kotlin.OptIn
6+
import kotlin.String
7+
import kotlin.collections.MutableMap
8+
import org.jetbrains.compose.resources.InternalResourceApi
9+
import org.jetbrains.compose.resources.ResourceContentHash
10+
import org.jetbrains.compose.resources.ResourceItem
11+
import org.jetbrains.compose.resources.StringResource
12+
13+
private const val MD: String = "composeResources/app.group.resources_test.generated.resources/"
14+
15+
@delegate:ResourceContentHash(405_464_824)
16+
internal val Res.string.PascalCase: StringResource by lazy {
17+
StringResource("string:PascalCase", "PascalCase", setOf(
18+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 172, 34),
19+
))
20+
}
21+
22+
@delegate:ResourceContentHash(-1_118_290_776)
23+
internal val Res.string._1_kebab_case: StringResource by lazy {
24+
StringResource("string:_1_kebab_case", "_1_kebab_case", setOf(
25+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 135, 36),
26+
))
27+
}
28+
29+
@delegate:ResourceContentHash(64_828_505)
30+
internal val Res.string.app_name: StringResource by lazy {
31+
StringResource("string:app_name", "app_name", setOf(
32+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 207, 44),
33+
))
34+
}
35+
36+
@delegate:ResourceContentHash(211_426_861)
37+
internal val Res.string.camelCase: StringResource by lazy {
38+
StringResource("string:camelCase", "camelCase", setOf(
39+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 252, 29),
40+
))
41+
}
42+
43+
@delegate:ResourceContentHash(466_457_346)
44+
internal val Res.string.hello: StringResource by lazy {
45+
StringResource("string:hello", "hello", setOf(
46+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 282, 37),
47+
))
48+
}
49+
50+
@delegate:ResourceContentHash(-1_288_591_563)
51+
internal val Res.string.`info_using_release_$x`: StringResource by lazy {
52+
StringResource("string:info_using_release_${'$'}x", "info_using_release_${'$'}x", setOf(
53+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 320, 57),
54+
))
55+
}
56+
57+
@delegate:ResourceContentHash(-624_025_575)
58+
internal val Res.string.multi_line: StringResource by lazy {
59+
StringResource("string:multi_line", "multi_line", setOf(
60+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 378, 178),
61+
))
62+
}
63+
64+
@delegate:ResourceContentHash(-1_332_636_786)
65+
internal val Res.string.str_template: StringResource by lazy {
66+
StringResource("string:str_template", "str_template", setOf(
67+
ResourceItem(setOf(), "${MD}values/strings.commonMain.cvr", 557, 76),
68+
))
69+
}
70+
71+
@InternalResourceApi
72+
internal fun _collectCommonMainString0Resources(map: MutableMap<String, StringResource>) {
73+
map.put("PascalCase", Res.string.PascalCase)
74+
map.put("_1_kebab_case", Res.string._1_kebab_case)
75+
map.put("app_name", Res.string.app_name)
76+
map.put("camelCase", Res.string.camelCase)
77+
map.put("hello", Res.string.hello)
78+
map.put("info_using_release_${'$'}x", Res.string.`info_using_release_$x`)
79+
map.put("multi_line", Res.string.multi_line)
80+
map.put("str_template", Res.string.str_template)
81+
}

gradle-plugins/compose/src/test/test-projects/misc/commonResourcesAnnotatedWithResourceContentHash/expected/commonMainResourceCollectors/app/group/resources_test/generated/resources/ExpectResourceCollectors.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/commonMainResourceCollectors/app/group/resources_test/generated/resources/ExpectResourceCollectors.kt

File renamed without changes.

gradle-plugins/compose/src/test/test-projects/misc/commonResourcesAnnotatedWithResourceContentHash/expected/commonResClass/app/group/resources_test/generated/resources/Res.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/commonResClass/app/group/resources_test/generated/resources/Res.kt

File renamed without changes.

gradle-plugins/compose/src/test/test-projects/misc/commonResourcesAnnotatedWithResourceContentHash/expected/commonMainResourceAccessors/app/group/resources_test/generated/resources/Drawable0.commonMain.kt renamed to gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-with-hash/desktopMainResourceAccessors/app/group/resources_test/generated/resources/String0.desktopMain.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ package app.group.resources_test.generated.resources
55
import kotlin.OptIn
66
import kotlin.String
77
import kotlin.collections.MutableMap
8-
import org.jetbrains.compose.resources.DrawableResource
98
import org.jetbrains.compose.resources.InternalResourceApi
109
import org.jetbrains.compose.resources.ResourceContentHash
1110
import org.jetbrains.compose.resources.ResourceItem
11+
import org.jetbrains.compose.resources.StringResource
1212

1313
private const val MD: String = "composeResources/app.group.resources_test.generated.resources/"
1414

15-
@delegate:ResourceContentHash(-1_557_874_605)
16-
internal val Res.drawable.raster: DrawableResource by lazy {
17-
DrawableResource("drawable:raster", setOf(
18-
ResourceItem(setOf(), "${MD}drawable/raster.png", -1, -1),
15+
@delegate:ResourceContentHash(-320_376_586)
16+
internal val Res.string.desktop_str: StringResource by lazy {
17+
StringResource("string:desktop_str", "desktop_str", setOf(
18+
ResourceItem(setOf(), "${MD}values/desktop_strings.desktopMain.cvr", 10, 39),
1919
))
2020
}
2121

2222
@InternalResourceApi
23-
internal fun _collectCommonMainDrawable0Resources(map: MutableMap<String, DrawableResource>) {
24-
map.put("raster", Res.drawable.raster)
23+
internal fun _collectDesktopMainString0Resources(map: MutableMap<String, StringResource>) {
24+
map.put("desktop_str", Res.string.desktop_str)
2525
}

0 commit comments

Comments
 (0)
⚡