Browse Source

Suppress "redundant visibility modifier" diagnostics so Res is compatible with `-Werror`, `-Wextra`, and IntelliJ inspections

pull/5297/head v1.8.10+dev2389
Matt Groth 1 year ago committed by Konstantin
parent
commit
bd0564f4a7
  1. 8
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GeneratedResClassSpec.kt
  2. 5
      gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/commonResClass/my/lib/res/Res.kt
  3. 5
      gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/commonResClass/app/group/resources_test/generated/resources/Res.kt
  4. 5
      gradle-plugins/compose/src/test/test-projects/misc/emptyResources/expected/commonResClass/app/group/empty_res/generated/resources/Res.kt
  5. 5
      gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/expected/commonResClass/me/app/jvmonlyresources/generated/resources/Res.kt

8
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/GeneratedResClassSpec.kt

@ -137,6 +137,12 @@ internal fun getResFileSpec(
.addMember("org.jetbrains.compose.resources.InternalResourceApi::class") .addMember("org.jetbrains.compose.resources.InternalResourceApi::class")
.build() .build()
) )
file.addAnnotation(
AnnotationSpec.builder(ClassName("kotlin", "Suppress"))
.addMember("%S","RedundantVisibilityModifier")
.addMember("%S","REDUNDANT_VISIBILITY_MODIFIER")
.build()
)
file.addType(TypeSpec.objectBuilder("Res").also { resObject -> file.addType(TypeSpec.objectBuilder("Res").also { resObject ->
resObject.addModifiers(resModifier) resObject.addModifiers(resModifier)
@ -399,4 +405,4 @@ private fun sortResources(
result[type] = typeResult result[type] = typeResult
} }
return result return result
} }

5
gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected-open-res/commonResClass/my/lib/res/Res.kt

@ -1,10 +1,15 @@
@file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class) @file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)
package my.lib.res package my.lib.res
import kotlin.ByteArray import kotlin.ByteArray
import kotlin.OptIn import kotlin.OptIn
import kotlin.String import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.getResourceUri import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes import org.jetbrains.compose.resources.readResourceBytes

5
gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/commonResClass/app/group/resources_test/generated/resources/Res.kt

@ -1,10 +1,15 @@
@file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class) @file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)
package app.group.resources_test.generated.resources package app.group.resources_test.generated.resources
import kotlin.ByteArray import kotlin.ByteArray
import kotlin.OptIn import kotlin.OptIn
import kotlin.String import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.getResourceUri import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes import org.jetbrains.compose.resources.readResourceBytes

5
gradle-plugins/compose/src/test/test-projects/misc/emptyResources/expected/commonResClass/app/group/empty_res/generated/resources/Res.kt

@ -1,10 +1,15 @@
@file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class) @file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)
package app.group.empty_res.generated.resources package app.group.empty_res.generated.resources
import kotlin.ByteArray import kotlin.ByteArray
import kotlin.OptIn import kotlin.OptIn
import kotlin.String import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.getResourceUri import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes import org.jetbrains.compose.resources.readResourceBytes

5
gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/expected/commonResClass/me/app/jvmonlyresources/generated/resources/Res.kt

@ -1,10 +1,15 @@
@file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class) @file:OptIn(org.jetbrains.compose.resources.InternalResourceApi::class)
@file:Suppress(
"RedundantVisibilityModifier",
"REDUNDANT_VISIBILITY_MODIFIER",
)
package me.app.jvmonlyresources.generated.resources package me.app.jvmonlyresources.generated.resources
import kotlin.ByteArray import kotlin.ByteArray
import kotlin.OptIn import kotlin.OptIn
import kotlin.String import kotlin.String
import kotlin.Suppress
import org.jetbrains.compose.resources.getResourceUri import org.jetbrains.compose.resources.getResourceUri
import org.jetbrains.compose.resources.readResourceBytes import org.jetbrains.compose.resources.readResourceBytes

Loading…
Cancel
Save