From 89664eb5d7980239f2c590a8b4b1c135a87ab6e5 Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Mon, 13 Mar 2023 16:00:49 -0700 Subject: [PATCH] Switch to plugin {} for concrete plugin dependency sets. --- samples/mixed/bukkit-plugins/hello-world/build.gradle.kts | 2 +- samples/mixed/gradle/wrapper/gradle-wrapper.properties | 2 +- samples/shared/gradle/wrapper/gradle-wrapper.properties | 2 +- .../gay/pizza/foundation/concrete/ConcretePluginPlugin.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts b/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts index aae32f5..73122c3 100644 --- a/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts +++ b/samples/mixed/bukkit-plugins/hello-world/build.gradle.kts @@ -7,6 +7,6 @@ dependencies { implementation(project(":bukkit-plugins:common-library")) } -concrete { +plugin { dependency(project(":bukkit-plugins:goodbye-world")) } diff --git a/samples/mixed/gradle/wrapper/gradle-wrapper.properties b/samples/mixed/gradle/wrapper/gradle-wrapper.properties index fc10b60..bdc9a83 100644 --- a/samples/mixed/gradle/wrapper/gradle-wrapper.properties +++ b/samples/mixed/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/shared/gradle/wrapper/gradle-wrapper.properties b/samples/shared/gradle/wrapper/gradle-wrapper.properties index fc10b60..bdc9a83 100644 --- a/samples/shared/gradle/wrapper/gradle-wrapper.properties +++ b/samples/shared/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt b/src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt index 5907167..40577b4 100644 --- a/src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt +++ b/src/main/kotlin/gay/pizza/foundation/concrete/ConcretePluginPlugin.kt @@ -9,7 +9,7 @@ class ConcretePluginPlugin : ConcreteBaseBukkitPlugin() { override fun apply(project: Project) { super.apply(project) - project.extensions.create("concrete", ConcretePluginExtension::class.java) + project.extensions.create("plugin", ConcretePluginExtension::class.java) project.plugins.apply("com.github.johnrengelman.shadow")