File tree Expand file tree Collapse file tree 3 files changed +15
-6
lines changed Expand file tree Collapse file tree 3 files changed +15
-6
lines changed Original file line number Diff line number Diff line change 2626 - name : Publish Plugin
2727 if : github.ref == 'refs/heads/main'
2828 env :
29- MAVEN_USERNAME : ${{ secrets .MAVEN_USERNAME }}
29+ MAVEN_USERNAME : ${{ vars .MAVEN_USERNAME }}
3030 MAVEN_PASSWORD : ${{ secrets.MAVEN_PASSWORD }}
3131 # TODO: add publishPlugins task
3232 run : ./gradlew publish
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ plugins {
66}
77
88group = " dev.arbjerg"
9- version = " 1.0.1 "
9+ version = " 1.0.2 "
1010
1111repositories {
1212 mavenCentral()
@@ -27,8 +27,8 @@ gradlePlugin {
2727 tags = setOf (" lavalink" , " discord" )
2828 }
2929
30- website = " https://github.com/lavalink-devs/gradle-plugin"
31- vcsUrl = " https://github.com/lavalink-devs/gradle-plugin"
30+ website = " https://github.com/lavalink-devs/lavalink- gradle-plugin"
31+ vcsUrl = " https://github.com/lavalink-devs/lavalink- gradle-plugin"
3232 }
3333}
3434
Original file line number Diff line number Diff line change 11package dev.arbjerg.lavalink.gradle
22
33import dev.arbjerg.lavalink.gradle.tasks.*
4- import dev.arbjerg.lavalink.gradle.tasks.generatedPluginManifest
5- import dev.arbjerg.lavalink.gradle.tasks.testServerFolder
64import org.gradle.api.Plugin
75import org.gradle.api.Project
86import org.gradle.api.artifacts.Dependency
7+ import org.gradle.api.artifacts.ProjectDependency
98import org.gradle.api.provider.Provider
109import org.gradle.api.tasks.Copy
1110import org.gradle.api.tasks.SourceSetContainer
@@ -76,6 +75,16 @@ private fun Project.configureTasks(serverDependency: Provider<Dependency>) {
7675 }
7776
7877 val jar = named<Jar >(" jar" ) {
78+ // Workaround for Gradle only depending on the classes task, but this approach needing the actual jar file
79+ configurations.getByName(" runtimeClasspath" ).dependencies.filterIsInstance<ProjectDependency >()
80+ .forEach {
81+ val jarTask = it.dependencyProject.tasks.findByPath(" jar" )
82+ if (jarTask != null ) {
83+ dependsOn(jarTask)
84+ } else {
85+ logger.warn(" Could not autoconfigure project dependency for ${it.dependencyProject.path} you might need to create a task dependency manually" )
86+ }
87+ }
7988 doFirst {
8089 configurations.getByName(" runtimeClasspath" ).resolvedConfiguration.resolvedArtifacts
8190 .mapNotNull { dep -> dep.file }.forEach {
You can’t perform that action at this time.
0 commit comments