Skip to content

Commit 0e5b3fe

Browse files
committed
Bugfixes
- Check if Java plugin is available - Fix serverVersion incorrectly defaulting to project version instead of api version - Run dependency unzipping at execution time to avoid issues with module dependencies
1 parent 95e1abe commit 0e5b3fe

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
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.0"
9+
version = "1.0.1"
1010

1111
repositories {
1212
mavenCentral()

src/main/kotlin/LavalinkGradlePlugin.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ internal val Project.extension get() = extensions.getByName<LavalinkExtension>(l
1919
class LavalinkGradlePlugin : Plugin<Project> {
2020
override fun apply(target: Project) {
2121
with(target) {
22+
check(plugins.hasPlugin("org.gradle.java")) { "Please apply the Java/Kotlin plugin before Lavalink" }
2223
configureExtension()
2324
val serverDependency = configureDependencies()
2425
configureTasks(serverDependency)
@@ -32,7 +33,7 @@ private fun Project.configureExtension(): LavalinkExtension {
3233
version.convention(provider { project.version.toString() })
3334
name.convention(project.name)
3435
path.convention(provider { project.group.toString() })
35-
serverVersion.convention(version)
36+
serverVersion.convention(apiVersion)
3637
}
3738
}
3839

@@ -75,10 +76,12 @@ private fun Project.configureTasks(serverDependency: Provider<Dependency>) {
7576
}
7677

7778
val jar = named<Jar>("jar") {
78-
configurations.getByName("runtimeClasspath").resolvedConfiguration.resolvedArtifacts
79-
.mapNotNull { dep -> dep.file }.forEach {
80-
from(zipTree(it))
81-
}
79+
doFirst {
80+
configurations.getByName("runtimeClasspath").resolvedConfiguration.resolvedArtifacts
81+
.mapNotNull { dep -> dep.file }.forEach {
82+
from(zipTree(it))
83+
}
84+
}
8285
}
8386

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

0 commit comments

Comments
 (0)