Skip to content

Commit

Permalink
chore:build changes
Browse files Browse the repository at this point in the history
  • Loading branch information
broccolai committed Oct 16, 2023
1 parent b912828 commit c1f9941
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 29 deletions.
3 changes: 2 additions & 1 deletion api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ dependencies {
api(libs.guice.core)
api(libs.minimessage)
api(libs.event.api)
}
api(libs.configurate)
}
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
package broccolai.tags.api.model.tag;

import org.checkerframework.checker.nullness.qual.NonNull;

public final class TagDisplayInformation {
private final @NonNull String material;
private final int customModelData;

public TagDisplayInformation(
@NonNull String material,
int customModelData
) {
this.material = material;
this.customModelData = customModelData;
}

public @NonNull String material() {
return this.material;
}

public int customModelData() {
return this.customModelData;
}

import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.configurate.objectmapping.ConfigSerializable;

//todo(josh): split tag into an interface and hide this in the implementation
// and remove configurate as a dependency in for api project
@ConfigSerializable
public record TagDisplayInformation(
@NonNull String material,
@Nullable Integer customModelData
) {
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ repositories {
}

dependencies {
implementation("gradle.plugin.com.github.jengelman.gradle.plugins", "shadow", "7.0.0")
implementation("com.github.johnrengelman", "shadow", "8.1.1")
}
3 changes: 1 addition & 2 deletions buildSrc/src/main/kotlin/Configurations.kt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ fun Project.setupShadowJar() {
)

archiveFileName.set(project.name + ".jar")
minimize()
}

getByName("build") {
Expand All @@ -52,4 +51,4 @@ private fun ShadowJar.relocate(group: Any, vararg dependencies: String) {
val name = split.last()
relocate(it, "$group.dependencies.$name")
}
}
}
4 changes: 3 additions & 1 deletion bukkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ dependencies {

api(libs.cloud.paper)
api(libs.cloud.extras)

implementation(libs.h2)
}

tasks {
runServer {
minecraftVersion("1.20")
}
}
}
2 changes: 1 addition & 1 deletion gradle/libs.versions.conf
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ versions = {
jdbi = "3.41.3"
hikari = "5.0.1"
flyway = "9.22.3"
h2 = "2.1.212"
h2 = "2.2.224"
configurate = "4.1.2"

# Misc
Expand Down
3 changes: 1 addition & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ plugins {

rootProject.name = "tags"


use("api", "core", "bukkit")

fun use(vararg names: String) {
for (name in names) {
include(name)
project(":$name").name = "${rootProject.name}-$name"
}
}
}

0 comments on commit c1f9941

Please sign in to comment.