Skip to content

Commit 2d6ca6f

Browse files
committed
No longer rely on jar task to pack project dependencies
- Auto-release on tags
1 parent 017b8b2 commit 2d6ca6f

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ jobs:
2929
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
3030
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
3131
run: ./gradlew publish publishPlugins
32+
- name: Release
33+
uses: softprops/action-gh-release@v1

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group = "dev.arbjerg"
9-
version = "1.0.11"
9+
version = "1.0.12"
1010

1111
repositories {
1212
mavenCentral()

src/main/kotlin/LavalinkGradlePlugin.kt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import dev.arbjerg.lavalink.gradle.tasks.*
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.api.artifacts.Dependency
7+
import org.gradle.api.artifacts.ProjectDependency
78
import org.gradle.api.provider.Provider
89
import org.gradle.api.publish.PublishingExtension
910
import org.gradle.api.publish.maven.MavenPublication
@@ -102,12 +103,27 @@ private fun Project.configureTasks(serverDependency: Provider<Dependency>) {
102103
}
103104

104105
val jar = named<Jar>("jar") {
105-
configurations.getByName("runtimeClasspath").resolvedConfiguration.resolvedArtifacts
106-
.mapNotNull { dep -> dep.file }.forEach {
106+
configurations.getByName("runtimeClasspath")
107+
.fileCollection {
108+
it !is ProjectDependency
109+
}
110+
.forEach {
107111
from(zipTree(it)) {
108112
exclude("META-INF/**")
109113
}
110114
}
115+
116+
configurations.getByName("runtimeClasspath")
117+
.allDependencies
118+
.filterIsInstance<ProjectDependency>()
119+
.forEach {
120+
val classes = it.dependencyProject.tasks.named("classes")
121+
.map { classes ->
122+
classes.taskDependencies.getDependencies(classes)
123+
}
124+
125+
from(classes)
126+
}
111127
}
112128

113129
val installPlugin by registering(Copy::class) {

0 commit comments

Comments
 (0)