Skip to content

Commit

Permalink
Use VanillaGradle version from project in runtime resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
jpenilla committed Apr 22, 2024
1 parent 0bf5427 commit 0bd0672
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
java
id("org.springframework.boot") version "3.2.5"
id("io.spring.dependency-management") version "1.1.4"
id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
alias(libs.plugins.vanillagradle)
}

group = "io.papermc"
Expand Down Expand Up @@ -54,6 +54,9 @@ abstract class ProcessBuildFile : DefaultTask() {
@get:Input
abstract val mcVer: Property<String>

@get:Input
abstract val vgVersion: Property<String>

@TaskAction
fun run() {
fsOps.delete {
Expand All @@ -67,6 +70,7 @@ abstract class ProcessBuildFile : DefaultTask() {
into(out.get())
}
val buildFile = out.file("build.gradle.kts.without_version").get().asFile.readText()
.replace("VG_VERSION", vgVersion.get())
out.file("build.gradle.kts").get().asFile.writeText(buildFile + "\nminecraft { version(\"${mcVer.get()}\") }\n")
}
}
Expand All @@ -75,6 +79,7 @@ val processBuildFile = tasks.register<ProcessBuildFile>("processBuildFile") {
input.set(layout.projectDirectory.dir("runtime-minecraft-resolver"))
out.set(layout.buildDirectory.dir("tmp/runtime-minecraft-resolver"))
mcVer.set(mcVersion)
vgVersion.set(libs.versions.vanillagradle)
}

val zip = tasks.register<Zip>("zipMcRuntimeResolver") {
Expand Down
5 changes: 5 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[versions]
vanillagradle = "0.2.1-SNAPSHOT"

[plugins]
vanillagradle = { id = "org.spongepowered.gradle.vanilla", version.ref = "vanillagradle" }
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform

plugins {
java
id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT"
id("org.spongepowered.gradle.vanilla") version "VG_VERSION"
}

java {
Expand Down

0 comments on commit 0bd0672

Please sign in to comment.