diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt index c4d78a22..dca638e6 100644 --- a/build-logic/src/main/kotlin/Versions.kt +++ b/build-logic/src/main/kotlin/Versions.kt @@ -24,7 +24,7 @@ */ object Versions { - const val geyserVersion = "2.0.3-SNAPSHOT" + const val geyserVersion = "2.0.4-SNAPSHOT" const val cumulusVersion = "1.1" const val configUtilsVersion = "1.0-SNAPSHOT" const val spigotVersion = "1.13-R0.1-SNAPSHOT" diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt index 69368784..54158d84 100644 --- a/build-logic/src/main/kotlin/extensions.kt +++ b/build-logic/src/main/kotlin/extensions.kt @@ -52,19 +52,23 @@ fun Project.buildNumber(): Int = fun Project.buildNumberAsString(): String = buildNumber().takeIf { it != -1 }?.toString() ?: "??" -val providedDependencies = mutableMapOf>() +val providedDependencies = mutableMapOf>>() val relocatedPackages = mutableMapOf>() fun Project.provided(pattern: String, name: String, version: String, excludedOn: Int = 0b110) { - providedDependencies.getOrPut(project.name) { mutableSetOf() } - .add("${calcExclusion(pattern, 0b100, excludedOn)}:" + - "${calcExclusion(name, 0b10, excludedOn)}:" + - calcExclusion(version, 0b1, excludedOn)) + val format = "${calcExclusion(pattern, 0b100, excludedOn)}:" + + "${calcExclusion(name, 0b10, excludedOn)}:" + + calcExclusion(version, 0b1, excludedOn) + + providedDependencies.getOrPut(project.name) { mutableSetOf() }.add(Pair(format, format)) dependencies.add("compileOnlyApi", "$pattern:$name:$version") } -fun Project.provided(dependency: ProjectDependency) = - provided(dependency.group!!, dependency.name, dependency.version!!) +fun Project.provided(dependency: ProjectDependency) { + providedDependencies.getOrPut(project.name) { mutableSetOf() } + .add(Pair(dependency.group + ":" + dependency.name, dependency)) + dependencies.add("compileOnlyApi", dependency) +} fun Project.relocate(pattern: String) = diff --git a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts index a0bd500b..bf3de089 100644 --- a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts @@ -18,10 +18,10 @@ tasks { val sJar: ShadowJar = this doFirst { - providedDependencies[project.name]?.forEach { string -> + providedDependencies[project.name]?.forEach { (name, notation) -> sJar.dependencies { - println("Excluding $string from ${project.name}") - exclude(dependency(string)) + println("Excluding $name from ${project.name}") + exclude(dependency(notation)) } }