Skip to content

Commit

Permalink
fix(gradle): more gradle issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@StillLutto
StillLutto committed Dec 26, 2024
1 parent 4ae1376 commit 08c78f3
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 52 deletions.
21 changes: 19 additions & 2 deletions api/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,25 @@ plugins {
id("com.github.johnrengelman.shadow") version "8.1.1"
}

val versionVar = version.toString()
val versionVar = version
val groupIdVar = "com.undefined"
val artifactIdVar = "stellar"

group = groupIdVar
version = versionVar

publishing {
publications {
register<MavenPublication>("maven") {
groupId = groupIdVar
artifactId = artifactIdVar
version = versionVar.toString()

from(components["java"])
}
}
}

dependencies {
compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
implementation(project(":common"))
Expand All @@ -30,7 +42,7 @@ dependencies {
implementation(project(":v1_16_4"))
implementation(project(":v1_16_5"))
implementation(project(":v1_17"))
implementation(project(":v1_17_1", "reobf"))
implementation(project(":v1_17_1"))
implementation(project(":v1_18_1"))
implementation(project(":v1_18_2"))
implementation(project(":v1_19_2"))
Expand All @@ -49,6 +61,11 @@ dependencies {
}

tasks {
shadowJar {
dependencyFilter.exclude { element ->
Regex("^v\\d+").matches(element.moduleName)
}
}
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
}
Expand Down
94 changes: 49 additions & 45 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
java
kotlin("jvm") version "1.9.22"
Expand All @@ -8,7 +10,7 @@ plugins {

apply(plugin = "maven-publish")
val projectGroupId = "com.undefined"
val projectVersion = "0.0.14"
val projectVersion = "0.0.30"
val projectArtifactId = "stellar"

group = projectGroupId
Expand Down Expand Up @@ -41,6 +43,16 @@ publishing {
}
}
}

publications {
register<MavenPublication>("maven") {
groupId = projectGroupId
artifactId = projectArtifactId
version = projectVersion

from(components["java"])
}
}
}

allprojects {
Expand All @@ -55,18 +67,6 @@ allprojects {
maven("https://repo.papermc.io/repository/maven-public/")
}

publishing {
publications {
register<MavenPublication>("maven") {
groupId = projectGroupId
artifactId = projectArtifactId
version = projectVersion

from(components["java"])
}
}
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib")
implementation("net.kyori:adventure-api:4.17.0")
Expand All @@ -79,41 +79,45 @@ allprojects {
dependencies {
implementation(project(":api"))
implementation(project(":common"))
implementation(project(":v1_13"))
implementation(project(":v1_13_1"))
implementation(project(":v1_13_2"))
implementation(project(":v1_14_1"))
implementation(project(":v1_14_2"))
implementation(project(":v1_14_3"))
implementation(project(":v1_14_4"))
implementation(project(":v1_15"))
implementation(project(":v1_15_1"))
implementation(project(":v1_15_2"))
implementation(project(":v1_16_1"))
implementation(project(":v1_16_2"))
implementation(project(":v1_16_3"))
implementation(project(":v1_16_4"))
implementation(project(":v1_16_5"))
implementation(project(":v1_17"))
implementation(project(":v1_17"))
implementation(project(":v1_17_1:", "reobf"))
implementation(project(":v1_18_1:", "reobf"))
implementation(project(":v1_18_2:", "reobf"))
implementation(project(":v1_19_2:", "reobf"))
implementation(project(":v1_19_3:", "reobf"))
implementation(project(":v1_19_4:", "reobf"))
implementation(project(":v1_20", "reobf"))
implementation(project(":v1_20_1", "reobf"))
implementation(project(":v1_20_2", "reobf"))
implementation(project(":v1_20_4", "reobf"))
implementation(project(":v1_20_6", "reobf"))
implementation(project(":v1_21", "reobf"))
implementation(project(":v1_21_1", "reobf"))
implementation(project(":v1_21_3", "reobf"))
implementation(project(":v1_21_4", "reobf"))
// implementation(project(":v1_13"))
// implementation(project(":v1_13_1"))
// implementation(project(":v1_13_2"))
// implementation(project(":v1_14_1"))
// implementation(project(":v1_14_2"))
// implementation(project(":v1_14_3"))
// implementation(project(":v1_14_4"))
// implementation(project(":v1_15"))
// implementation(project(":v1_15_1"))
// implementation(project(":v1_15_2"))
// implementation(project(":v1_16_1"))
// implementation(project(":v1_16_2"))
// implementation(project(":v1_16_3"))
// implementation(project(":v1_16_4"))
// implementation(project(":v1_16_5"))
// implementation(project(":v1_17"))
// implementation(project(":v1_17"))
// implementation(project(":v1_17_1:", "reobf"))
// implementation(project(":v1_18_1:", "reobf"))
// implementation(project(":v1_18_2:", "reobf"))
// implementation(project(":v1_19_2:", "reobf"))
// implementation(project(":v1_19_3:", "reobf"))
// implementation(project(":v1_19_4:", "reobf"))
// implementation(project(":v1_20", "reobf"))
// implementation(project(":v1_20_1", "reobf"))
// implementation(project(":v1_20_2", "reobf"))
// implementation(project(":v1_20_4", "reobf"))
// implementation(project(":v1_20_6", "reobf"))
// implementation(project(":v1_21", "reobf"))
// implementation(project(":v1_21_1", "reobf"))
// implementation(project(":v1_21_3", "reobf"))
// implementation(project(":v1_21_4", "reobf"))
}

tasks {
withType<ShadowJar> {
archiveFileName.set("${project.name}-${project.version}.jar")
archiveClassifier.set("mapped")
}
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
}
Expand Down
14 changes: 13 additions & 1 deletion common/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,22 @@ plugins {
kotlin("jvm") version "1.9.22"
}

val versionVar = version.toString()
val versionVar = version
val groupIdVar = "com.undefined"
val artifactIdVar = "stellar"

publishing {
publications {
register<MavenPublication>("maven") {
groupId = groupIdVar
artifactId = artifactIdVar
version = versionVar.toString()

from(components["java"])
}
}
}

dependencies {
compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
api("com.mojang:authlib:1.5.21")
Expand Down
8 changes: 4 additions & 4 deletions common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,28 +88,28 @@ open class ArgumentHandler {
fun addBooleanArgument(name: String): BooleanArgument =
addArgument { BooleanArgument(base, name) }

fun <T, U : AbstractStellarArgument<*>> addListArgument(
fun <T> addListArgument(
name: String,
list: List<T>,
stringifier: (T) -> Suggestion,
parse: (Any?) -> T
): ListArgument<T> = addArgument { ListArgument(base, StringArgument(base, name, StringType.WORD), list, stringifier, parse) }

fun <T, U : AbstractStellarArgument<*>> addListArgument(
fun <T> addListArgument(
type: AbstractStellarArgument<*>,
list: List<T>,
stringifier: (T) -> Suggestion,
parse: (Any?) -> T
): ListArgument<T> = addArgument { ListArgument(base, type, list, stringifier, parse) }

fun <T, U : AbstractStellarArgument<*>> addListArgument(
fun <T> addListArgument(
name: String,
list: () -> List<T>,
stringifier: (T) -> Suggestion,
parse: (Any?) -> T
): ListArgument<T> = addArgument { ListArgument(base, StringArgument(base, name, StringType.WORD), list, stringifier, parse) }

fun <T, U : AbstractStellarArgument<*>> addListArgument(
fun <T> addListArgument(
type: AbstractStellarArgument<*>,
list: () -> List<T>,
stringifier: (T) -> Suggestion,
Expand Down

0 comments on commit 08c78f3

Please sign in to comment.