Skip to content

Commit

Permalink
Update build script
Browse files Browse the repository at this point in the history
  • Loading branch information
ryderbelserion committed Feb 27, 2024
1 parent 980e7b5 commit c403823
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 35 deletions.
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/fabric-plugin.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ base {
archivesName.set("${rootProject.name}-${project.name.uppercaseFirstChar()}")
}

val mcVersion = rootProject.properties["minecraftVersion"] as String
val fabricVersion = rootProject.properties["fabricVersion"] as String
val mcVersion = providers.gradleProperty("mcVersion")
val fabricVersion = providers.gradleProperty("version")

project.version = if (System.getenv("BUILD_NUMBER") != null) "$fabricVersion-${System.getenv("BUILD_NUMBER")}" else fabricVersion

tasks {
val isBeta: Boolean = rootProject.extra["isBeta"]?.toString()?.toBoolean() ?: false
val isBeta: Boolean = providers.gradleProperty("isBeta").get().toBoolean()
val type = if (isBeta) "Beta" else "Release"

modrinth {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/paper-plugin.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ repositories {
flatDir { dirs("libs") }
}

val mcVersion = rootProject.properties["minecraftVersion"] as String
val mcVersion = providers.gradleProperty("mcVersion").get()

project.version = if (System.getenv("BUILD_NUMBER") != null) "${rootProject.version}-${System.getenv("BUILD_NUMBER")}" else rootProject.version

Expand All @@ -52,7 +52,7 @@ tasks {
}

val directory = File("$rootDir/jars")
val isBeta: Boolean = rootProject.extra["isBeta"]?.toString()?.toBoolean() ?: false
val isBeta: Boolean = providers.gradleProperty("isBeta").get().toBoolean()
val type = if (isBeta) "Beta" else "Release"

// Publish to hangar.papermc.io.
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/root-plugin.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ tasks {
}

val directory = File("$rootDir/jars")
val mcVersion = rootProject.properties["minecraftVersion"] as String
val mcVersion = providers.gradleProperty("mcVersion").get()

modrinth {
autoAddDependsOn.set(false)
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
api(project(":api"))

api(libs.config.me) {
api(libs.configme) {
exclude(group = "org.yaml", module = "snakeyaml")
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ description = Add unlimited crates to your server with 10 different crate types
version = 1.21
apiVersion = 1.20

minecraftVersion = 1.20.4
mcVersion=1.20.4
isBeta = false
21 changes: 0 additions & 21 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
[versions]
kyori_version = "4.14.0"

cluster_version = "6.3"

shadow_version = "8.1.1"
paperweight_version = "1.5.9"
runpaper_version = "2.2.3"
Expand All @@ -22,25 +20,6 @@ shadowjar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow_vers
adventure = { module = "net.kyori:adventure-api", version.ref = "kyori_version" }
minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "kyori_version" }

cluster_paper = { module = "com.ryderbelserion.cluster:paper", version.ref = "cluster_version" }
cluster_api = { module = "com.ryderbelserion.cluster:api", version.ref = "cluster_version" }

nbtapi = { module = "de.tr7zw:item-nbt-api", version = "2.12.2" }

triumph_cmds = { module = "dev.triumphteam:triumph-cmd-bukkit", version = "2.0.0-SNAPSHOT" }

config_me = { module = "ch.jalu:configme", version = "1.4.1" }

metrics = { module = "org.bstats:bstats-bukkit", version = "3.0.2" }

itemsadder = { module = "com.github.LoneDev6:api-itemsadder", version = "3.6.1" }
oraxen = { module = "io.th0rgal:oraxen", version = "1.164.0" }

holographicdisplays = { module = "me.filoghost.holographicdisplays:holographicdisplays-api", version = "3.0.0" }
decentholograms = { module = "com.github.decentsoftware-eu:decentholograms", version = "2.8.6" }

placeholderapi = { module = "me.clip:placeholderapi", version = "2.11.5" }

paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version.ref = "paperweight_version" }
shadowjar = { module = "com.github.johnrengelman:shadow", version.ref = "shadow_version" }
runpaper = { module = "xyz.jpenilla:run-task", version.ref = "runpaper_version" }
Expand Down
10 changes: 4 additions & 6 deletions paper/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ plugins {
id("paper-plugin")
}

val mcVersion = rootProject.properties["minecraftVersion"] as String

dependencies {
api(project(":common"))

implementation(libs.cluster.paper)

implementation(libs.triumph.cmds)
implementation(libs.triumphcmds)

implementation(libs.metrics)

Expand Down Expand Up @@ -46,9 +44,9 @@ tasks {
"version" to project.version,
"group" to rootProject.group,
"description" to rootProject.description,
"apiVersion" to rootProject.properties["apiVersion"],
"authors" to rootProject.properties["authors"],
"website" to rootProject.properties["website"]
"apiVersion" to providers.gradleProperty("apiVersion").get(),
"authors" to providers.gradleProperty("authors").get(),
"website" to providers.gradleProperty("website").get()
)

inputs.properties(properties)
Expand Down
36 changes: 36 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,42 @@ pluginManagement {
}
}

dependencyResolutionManagement {
repositories {
maven("https://repo.papermc.io/repository/maven-public/")

gradlePluginPortal()
mavenCentral()
}

versionCatalogs {
create("libs") {
version("cluster", "6.3")

library("holographicdisplays", "me.filoghost.holographicdisplays", "holographicdisplays-api").version("3.0.0")

library("decentholograms", "com.github.decentsoftware-eu", "decentholograms").version("2.8.6")

library("triumphcmds", "dev.triumphteam", "triumph-cmd-bukkit").version("2.0.0-SNAPSHOT")

library("cluster_paper", "com.ryderbelserion.cluster", "paper").versionRef("cluster")
library("cluster_api", "com.ryderbelserion.cluster", "paper").versionRef("cluster")

library("itemsadder", "com.github.LoneDev6", "api-itemsadder").version("3.6.1")

library("placeholderapi", "me.clip", "placeholderapi").version("2.11.5")

library("metrics", "org.bstats", "bstats-bukkit").version("3.0.2")

library("nbtapi", "de.tr7zw", "item-nbt-api").version("2.12.2")

library("oraxen", "io.th0rgal", "oraxen").version("1.164.0")

library("configme", "ch.jalu", "configme").version("1.4.1")
}
}
}

rootProject.name = "CrazyCrates"

include("api")
Expand Down

0 comments on commit c403823

Please sign in to comment.