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

Update GeneratedResClassSpec.kt #5190

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update GeneratedResClassSpec.kt #5190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
836e0d3
Update GeneratedResClassSpec.kt
mgroth0 Dec 18, 2024
fee82b1
update tests
mgroth0 Dec 18, 2024
4a2d9ce
update test
mgroth0 Dec 19, 2024
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
8 changes: 7 additions & 1 deletion ...-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GeneratedResClassSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,12 @@ internal fun getResFileSpec(
.addMember("org.jetbrains.compose.resources.ExperimentalResourceApi::class")
.build()
)
file.addAnnotation(
AnnotationSpec.builder(ClassName("kotlin", "Suppress"))
.addMember("%S","RedundantVisibilityModifier")
.addMember("%S","REDUNDANT_VISIBILITY_MODIFIER")
.build()
)
file.addType(TypeSpec.objectBuilder("Res").also { resObject ->
resObject.addModifiers(resModifier)

Expand Down Expand Up @@ -407,4 +413,4 @@ private fun sortResources(
result[type] = typeResult
}
return result
}
}
5 changes: 5 additions & 0 deletions ...est/test-projects/misc/commonResources/expected-open-res/commonResClass/my/lib/res/Res.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
org.jetbrains.compose.resources.InternalResourceApi::class,
org.jetbrains.compose.resources.ExperimentalResourceApi::class,
)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)

package my.lib.res

import kotlin.ByteArray
import kotlin.OptIn
import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.ExperimentalResourceApi
import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes
Expand Down
5 changes: 5 additions & 0 deletions ...mmonResources/expected/commonResClass/app/group/resources_test/generated/resources/Res.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
org.jetbrains.compose.resources.InternalResourceApi::class,
org.jetbrains.compose.resources.ExperimentalResourceApi::class,
)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)

package app.group.resources_test.generated.resources

import kotlin.ByteArray
import kotlin.OptIn
import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.ExperimentalResourceApi
import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes
Expand Down
5 changes: 5 additions & 0 deletions ...isc/emptyResources/expected/commonResClass/app/group/empty_res/generated/resources/Res.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
org.jetbrains.compose.resources.InternalResourceApi::class,
org.jetbrains.compose.resources.ExperimentalResourceApi::class,
)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)

package app.group.empty_res.generated.resources

import kotlin.ByteArray
import kotlin.OptIn
import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.ExperimentalResourceApi
import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes
Expand Down
5 changes: 5 additions & 0 deletions ...mOnlyResources/expected/commonResClass/me/app/jvmonlyresources/generated/resources/Res.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
org.jetbrains.compose.resources.InternalResourceApi::class,
org.jetbrains.compose.resources.ExperimentalResourceApi::class,
)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)

package me.app.jvmonlyresources.generated.resources

import kotlin.ByteArray
import kotlin.OptIn
import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.ExperimentalResourceApi
import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes
Expand Down
Loading