Skip to content

Commit

Permalink
Fix issues with picking binary
Browse files Browse the repository at this point in the history
- no longer resolve transitive dependencies of binary dependency
- Revert last change to verification
- Add debug logging
- Request correct dependency
  • Loading branch information
DRSchlaubi committed Aug 3, 2023
1 parent 5915850 commit 145c814
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group = "dev.arbjerg"
version = "1.0.9"
version = "1.0.10"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ java {

lavalinkPlugin {
apiVersion = "4.0.0-beta.3"
serverVersion = gitHash("fc51c58e0168b63cc9d6ed37f1adc7ef369c46a3")
serverVersion = "4.0.0-beta.3"
}
5 changes: 4 additions & 1 deletion src/main/kotlin/LavalinkGradlePlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ private fun Project.configureDependencies(): Provider<Dependency> {
}

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

Expand Down
5 changes: 4 additions & 1 deletion src/main/kotlin/tasks/DownloadLavalinkTask.kt
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,13 @@ abstract class DownloadLavalinkTask : DefaultTask() {
val configuration = project.configurations.detachedConfiguration(dependency)
.markResolvable()

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

didWork = project.copy {
Expand Down

0 comments on commit 145c814

Please sign in to comment.