From acf2f404cbe28fc8fa5cff573107bdc64c490c88 Mon Sep 17 00:00:00 2001 From: Ali Date: Mon, 16 Dec 2024 20:13:21 +0300 Subject: [PATCH] minor cleanups and fixes --- api/build.gradle.kts | 3 --- api/src/main/java/revxrsal/zapper/DependencyScope.java | 2 +- api/src/main/java/revxrsal/zapper/repository/Repository.java | 1 - gradle-plugin/build.gradle.kts | 2 -- .../src/main/java/revxrsal/zapper/gradle/ZapperPlugin.kt | 4 +--- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 0ec1715..d979a90 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("java") } -group = "io.github.revxrsal" -version = "1.0" - repositories { mavenCentral() maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") diff --git a/api/src/main/java/revxrsal/zapper/DependencyScope.java b/api/src/main/java/revxrsal/zapper/DependencyScope.java index bc1f889..8d89834 100644 --- a/api/src/main/java/revxrsal/zapper/DependencyScope.java +++ b/api/src/main/java/revxrsal/zapper/DependencyScope.java @@ -36,7 +36,7 @@ public interface DependencyScope { * Adds a dependency. The behavior varies depending on the implementation */ void dependency(@NotNull Dependency dependency); - + /** * Adds a dependency. The behavior varies depending on the implementation */ diff --git a/api/src/main/java/revxrsal/zapper/repository/Repository.java b/api/src/main/java/revxrsal/zapper/repository/Repository.java index 2f5de20..e9713d0 100644 --- a/api/src/main/java/revxrsal/zapper/repository/Repository.java +++ b/api/src/main/java/revxrsal/zapper/repository/Repository.java @@ -5,7 +5,6 @@ import revxrsal.zapper.Dependency; import java.io.File; -import java.net.MalformedURLException; import java.net.URL; /** diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index ab2b324..5f9b1f6 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -4,8 +4,6 @@ plugins { id("com.gradle.plugin-publish") version "1.2.1" } -version = "0.0.1" - repositories { mavenCentral() gradlePluginPortal() diff --git a/gradle-plugin/src/main/java/revxrsal/zapper/gradle/ZapperPlugin.kt b/gradle-plugin/src/main/java/revxrsal/zapper/gradle/ZapperPlugin.kt index a092f56..ed1fdcd 100644 --- a/gradle-plugin/src/main/java/revxrsal/zapper/gradle/ZapperPlugin.kt +++ b/gradle-plugin/src/main/java/revxrsal/zapper/gradle/ZapperPlugin.kt @@ -1,13 +1,11 @@ package revxrsal.zapper.gradle -import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.repositories.MavenArtifactRepository import org.gradle.jvm.tasks.Jar -import org.gradle.kotlin.dsl.hasPlugin import org.gradle.kotlin.dsl.withType import java.io.File @@ -23,7 +21,7 @@ private const val PLUGIN_VERSION: String = "0.0.1" class ZapperPlugin : Plugin { override fun apply(project: Project) { - if (!project.plugins.hasPlugin(ShadowPlugin::class)) { + if (!project.plugins.hasPlugin("com.github.johnrengelman.shadow")) { error("ShadowJar is required by the Zapper Gradle plugin. Please add ShadowJar v8.11.0") }