Skip to content

Commit 145c814

Browse files
committed
Fix issues with picking binary
- no longer resolve transitive dependencies of binary dependency - Revert last change to verification - Add debug logging - Request correct dependency
1 parent 5915850 commit 145c814

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

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.9"
9+
version = "1.0.10"
1010

1111
repositories {
1212
mavenCentral()

example/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ java {
2121

2222
lavalinkPlugin {
2323
apiVersion = "4.0.0-beta.3"
24-
serverVersion = gitHash("fc51c58e0168b63cc9d6ed37f1adc7ef369c46a3")
24+
serverVersion = "4.0.0-beta.3"
2525
}

src/main/kotlin/LavalinkGradlePlugin.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ private fun Project.configureDependencies(): Provider<Dependency> {
5252
}
5353

5454
return extension.serverVersion.map { serverVersion ->
55-
project.dependencies.create("dev.arbjerg.lavalink:Lavalink-Server:$serverVersion")
55+
project.dependencies.create("dev.arbjerg.lavalink:Lavalink-Server:$serverVersion@jar") {
56+
// we only care about the full executable jar here, so no dependencies required
57+
isTransitive = false
58+
}
5659
}
5760
}
5861

src/main/kotlin/tasks/DownloadLavalinkTask.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,13 @@ abstract class DownloadLavalinkTask : DefaultTask() {
3737
val configuration = project.configurations.detachedConfiguration(dependency)
3838
.markResolvable()
3939

40-
val archive = configuration.resolve().first {
40+
val files = configuration.resolve()
41+
logger.debug("Resolved Lavalink dependencies to: {}", files)
42+
val archive = files.single {
4143
it.name.endsWith(".jar")
4244
&& "plain" !in it.name && "sources" !in it.name && "javadoc" !in it.name
4345
}
46+
logger.debug("Resolved lavalink binary to: {}", archive.name)
4447
val path = project.gradle.gradleUserHomeDir.toPath() / "lavalink-versions" / dependency.version!!
4548

4649
didWork = project.copy {

0 commit comments

Comments
 (0)