diff --git a/gradle-license-plugin/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt b/gradle-license-plugin/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt index 681d0c41..1ebe9a3d 100644 --- a/gradle-license-plugin/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt +++ b/gradle-license-plugin/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt @@ -13,7 +13,7 @@ class LicensePlugin : Plugin { project.isAndroidProject() -> project.configureAndroidProject() project.isJavaProject() -> project.configureJavaProject() else -> throw UnsupportedOperationException( - "'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle Plugins.", + "'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle based plugins.", ) } } diff --git a/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginJavaSpec.groovy b/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginJavaSpec.groovy index ba7b1842..954079b8 100644 --- a/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginJavaSpec.groovy +++ b/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginJavaSpec.groovy @@ -524,7 +524,7 @@ final class LicensePluginJavaSpec extends Specification { buildFile << """ plugins { - id 'java' + id 'java-library' id 'com.jaredsburrows.license' } diff --git a/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginSpec.groovy b/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginSpec.groovy index 956023c6..42ef2193 100644 --- a/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginSpec.groovy +++ b/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginSpec.groovy @@ -6,7 +6,6 @@ import spock.lang.Specification import spock.lang.Unroll import static org.gradle.testkit.runner.TaskOutcome.SUCCESS -import static org.gradle.testkit.runner.TaskOutcome.FAILED import static test.TestUtils.gradleWithCommand import static test.TestUtils.gradleWithCommandWithFail @@ -49,7 +48,7 @@ final class LicensePluginSpec extends Specification { } } - apply plugin: 'java' + apply plugin: 'java-library' apply plugin: 'com.jaredsburrows.license' """ @@ -82,7 +81,7 @@ final class LicensePluginSpec extends Specification { def result = gradleWithCommandWithFail(testProjectDir.root, 'licenseReport', '-s') then: - result.output.contains("'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle Plugins.") + result.output.contains("'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle based plugins.") } def 'apply plugin with plugins dsl'() { @@ -90,7 +89,7 @@ final class LicensePluginSpec extends Specification { buildFile << """ plugins { - id 'java' + id 'java-library' id 'com.jaredsburrows.license' } """ @@ -115,7 +114,7 @@ final class LicensePluginSpec extends Specification { def result = gradleWithCommandWithFail(testProjectDir.root, 'licenseReport', '-s') then: - result.output.contains("'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle Plugins.") + result.output.contains("'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle based plugins.") } @Unroll @@ -133,7 +132,7 @@ final class LicensePluginSpec extends Specification { def result = gradleWithCommandWithFail(testProjectDir.root, 'licenseReport', '-s') then: - result.output.contains("'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle Plugins.") + result.output.contains("'com.jaredsburrows.license' requires Java, Kotlin or Android Gradle based plugins.") where: // https://github.com/gradle/gradle/find/master, search for "gradle-plugins" diff --git a/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginVersionSpec.groovy b/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginVersionSpec.groovy index b821874e..f25c4a5a 100644 --- a/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginVersionSpec.groovy +++ b/gradle-license-plugin/src/test/groovy/com/jaredsburrows/license/LicensePluginVersionSpec.groovy @@ -40,7 +40,7 @@ final class LicensePluginVersionSpec extends Specification { buildFile << """ plugins { - id 'java' + id 'java-library' id 'com.jaredsburrows.license' } """