0.0.6 (#5)

* Fix api version retrieving * Refactor mislocated components * Fix exclude rules are not applied to runtime classpath issue
vjh0107 · Oct 12, 2024 · b9805ec · b9805ec
1 parent e51de87
commit b9805ec
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ kotlin.code.style=official
 
 project.group=kr.junhyung
 project.artifact=pluginjar
-project.version=0.0.5
+project.version=0.0.6
 
 project.description=A Gradle plugin that streamlines the process of creating a plugin JAR.
 

diff --git a/...ginjar/plugin/PluginMetaPropertySource.kt → ...luginjar/core/PluginMetaPropertySource.kt b/...ginjar/plugin/PluginMetaPropertySource.kt → ...luginjar/core/PluginMetaPropertySource.kt
@@ -1,6 +1,4 @@
-package kr.junhyung.pluginjar.plugin
-
-import kr.junhyung.pluginjar.core.PluginMeta
+package kr.junhyung.pluginjar.core
 
 interface PluginMetaPropertySource {
 

diff --git a/...injar/plugin/service/PluginMetaService.kt → ...uginjar/core/service/PluginMetaService.kt b/...injar/plugin/service/PluginMetaService.kt → ...uginjar/core/service/PluginMetaService.kt
@@ -1,4 +1,4 @@
-package kr.junhyung.pluginjar.plugin.service
+package kr.junhyung.pluginjar.core.service
 
 import java.io.File
 

diff --git a/...in/service/SerializedPluginMetaService.kt → ...re/service/SerializedPluginMetaService.kt b/...in/service/SerializedPluginMetaService.kt → ...re/service/SerializedPluginMetaService.kt
@@ -1,8 +1,8 @@
-package kr.junhyung.pluginjar.plugin.service
+package kr.junhyung.pluginjar.core.service
 
 import kr.junhyung.pluginjar.core.PluginMeta
 import kr.junhyung.pluginjar.core.PluginMetaSerializer
-import kr.junhyung.pluginjar.plugin.PluginMetaPropertySource
+import kr.junhyung.pluginjar.core.PluginMetaPropertySource
 import java.io.File
 
 class SerializedPluginMetaService(

diff --git a/pluginjar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/PluginJarPlugin.kt b/pluginjar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/PluginJarPlugin.kt
@@ -4,8 +4,8 @@ import kr.junhyung.pluginjar.core.PluginMainClassResolver
 import kr.junhyung.pluginjar.core.PluginMeta
 import kr.junhyung.pluginjar.core.PluginMetaSerializer
 import kr.junhyung.pluginjar.plugin.dsl.internal.runtimeClasspath
-import kr.junhyung.pluginjar.plugin.service.PluginMetaService
-import kr.junhyung.pluginjar.plugin.service.SerializedPluginMetaService
+import kr.junhyung.pluginjar.core.service.PluginMetaService
+import kr.junhyung.pluginjar.core.service.SerializedPluginMetaService
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project

diff --git a/pluginjar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/ProcessPluginResources.kt b/pluginjar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/ProcessPluginResources.kt
@@ -1,6 +1,6 @@
 package kr.junhyung.pluginjar.plugin
 
-import kr.junhyung.pluginjar.plugin.service.PluginMetaService
+import kr.junhyung.pluginjar.core.service.PluginMetaService
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty

diff --git a/...njar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/ProjectPluginMetaPropertySource.kt b/...njar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/ProjectPluginMetaPropertySource.kt
@@ -3,6 +3,7 @@ package kr.junhyung.pluginjar.plugin
 import kr.junhyung.pluginjar.core.PluginMainClass
 import kr.junhyung.pluginjar.core.PluginMainClassResolver
 import kr.junhyung.pluginjar.core.PluginMeta
+import kr.junhyung.pluginjar.core.PluginMetaPropertySource
 import kr.junhyung.pluginjar.plugin.dsl.internal.compileClasspath
 import kr.junhyung.pluginjar.plugin.dsl.internal.runtimeClasspath
 import org.gradle.api.Project
@@ -66,7 +67,7 @@ class ProjectPluginMetaPropertySource(
             .allDependencies
         val implementation = compileClasspathDependencies.find { dependency ->
             BukkitDependency.values().any { implementation ->
-                implementation.group == dependency.group && implementation.name == dependency.name
+                implementation.module.group == dependency.group && implementation.module.name == dependency.name
             }
         } ?: return null
         val implementationVersion = implementation.version ?: return null
@@ -117,6 +118,7 @@ class ProjectPluginMetaPropertySource(
         }
         val result = mutableSetOf<String>()
         collectDependencies(project, result)
+        applyExcludeRules(result)
         return result.toList()
     }
 
@@ -139,4 +141,11 @@ class ProjectPluginMetaPropertySource(
                 }
             }
     }
+
+    private fun applyExcludeRules(result: MutableSet<String>) {
+        project.configurations.runtimeClasspath.excludeRules.forEach {
+            result.removeIf { dependency -> dependency.startsWith("${it.group}:${it.module}") }
+        }
+    }
+
 }
diff --git a/...injar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/dsl/BukkitDependencyExtensions.kt b/...injar-plugin/src/main/java/kr/junhyung/pluginjar/plugin/dsl/BukkitDependencyExtensions.kt
@@ -2,13 +2,7 @@ package kr.junhyung.pluginjar.plugin.dsl
 
 import kr.junhyung.pluginjar.plugin.BukkitDependency
 import kr.junhyung.pluginjar.plugin.BukkitVersion
-import org.gradle.api.JavaVersion
-import org.gradle.api.Project
 import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.gradle.api.plugins.ExtensionAware
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.internal.jvm.Jvm
-import org.gradle.kotlin.dsl.getByType
 
 fun DependencyHandler.spigot(version: String): Any {
     return buildBukkitDependency(BukkitDependency.SPIGOT, version)