Browse Source

Fix references to outdated 'nativeExecutables' in error messages (#3019)

In 991b7ff6a7 'nativeExecutables' was
renamed to 'nativeDistributions', however a later commit added error
messages that still reference the old DSL names.
pull/3030/head
Sebastian 2 years ago committed by GitHub
parent
commit
532bb3d6d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
  2. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/validateBundleID.kt

4
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt

@ -72,10 +72,10 @@ private val ERR_UNKNOWN_PREFIX =
"""|$ERR_PREFIX Could not infer signing prefix. To specify: """|$ERR_PREFIX Could not infer signing prefix. To specify:
| * Set bundleID to reverse DNS notation (e.g. "com.mycompany.myapp"); | * Set bundleID to reverse DNS notation (e.g. "com.mycompany.myapp");
| * Use '${ComposeProperties.MAC_SIGN_PREFIX}' Gradle property; | * Use '${ComposeProperties.MAC_SIGN_PREFIX}' Gradle property;
| * Use 'nativeExecutables.macOS.signing.prefix' DSL property; | * Use 'nativeDistributions.macOS.signing.prefix' DSL property;
""".trimMargin() """.trimMargin()
private val ERR_UNKNOWN_SIGN_ID = private val ERR_UNKNOWN_SIGN_ID =
"""|$ERR_PREFIX signing identity is null or empty. To specify: """|$ERR_PREFIX signing identity is null or empty. To specify:
| * Use '${ComposeProperties.MAC_SIGN_ID}' Gradle property; | * Use '${ComposeProperties.MAC_SIGN_ID}' Gradle property;
| * Use 'nativeExecutables.macOS.signing.identity' DSL property; | * Use 'nativeDistributions.macOS.signing.identity' DSL property;
""".trimMargin() """.trimMargin()

2
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/validateBundleID.kt

@ -19,7 +19,7 @@ private const val BUNDLE_ID_FORMAT =
"bundleID may only contain alphanumeric characters (A-Z, a-z, 0-9), hyphen (-) and period (.) characters" "bundleID may only contain alphanumeric characters (A-Z, a-z, 0-9), hyphen (-) and period (.) characters"
private val ERR_BUNDLE_ID_IS_EMPTY = private val ERR_BUNDLE_ID_IS_EMPTY =
"""|$ERR_PREFIX bundleID is empty or null. To specify: """|$ERR_PREFIX bundleID is empty or null. To specify:
| * Use 'nativeExecutables.macOS.bundleID' DSL property; | * Use 'nativeDistributions.macOS.bundleID' DSL property;
| * $BUNDLE_ID_FORMAT; | * $BUNDLE_ID_FORMAT;
| * Use reverse DNS notation (e.g. "com.mycompany.myapp"); | * Use reverse DNS notation (e.g. "com.mycompany.myapp");
|""".trimMargin() |""".trimMargin()

Loading…
Cancel
Save