Skip to content

Prepare update to mc version of 26.1.2 #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RitaSister wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Prepare update to mc version of 26.1.2 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f14810
up gradle minor version from 9.1.0 to 9.5.0
Jun 14, 2026
f3bece2
prepare to update mc 26.1.2
Jun 16, 2026
c4910b5
up to java version to 25
Jun 16, 2026
3766bb7
bump kotlin version to latest
Jun 16, 2026
3c4002e
bump plugin version of 1.11.2.25
Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@ allprojects {
checkstyle(checkstyleVersion)

kotlin {
jvmToolchain(21)
jvmToolchain(25)
}

javaVersions {
target(21)
target(25)
}
}
}

subprojects {
tasks.withType<JavaCompile> {
options.encoding = Charsets.UTF_8.name()
options.release.set(21)
options.release.set(25)
}

tasks.withType<KotlinCompile> {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget.set(JvmTarget.JVM_25)
languageVersion.set(KotlinVersion.KOTLIN_2_0)
}
}
Expand All @@ -82,4 +82,4 @@ subprojects {
}
}

}
}
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=net.ritasister
version=1.10.11.21
version=1.11.2.25
description=Protect your region on the server.
author=RitaSister
contributor=IRedTea
Expand All @@ -9,4 +9,4 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.cache=true
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.vfs.watch=false
org.gradle.vfs.watch=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pluginManagement {
mavenCentral()
}
plugins {
kotlin("jvm") version "2.1.20"
kotlin("jvm") version "2.4.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
}
Expand All @@ -16,4 +16,4 @@ include(
"wgrp-api",
"wgrp-common",
"wgrp-paper"
)
)
11 changes: 6 additions & 5 deletions wgrp-paper/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import xyz.jpenilla.runpaper.task.RunServer
import io.papermc.paperweight.userdev.ReobfArtifactConfiguration

plugins {
id("io.papermc.paperweight.userdev") version "2.0.0-beta.19"
id("io.papermc.paperweight.userdev") version "2.0.0-beta.21"
alias(libs.plugins.shadow)
alias(libs.plugins.runPaper)
}
Expand All @@ -21,13 +20,11 @@ repositories {
mavenCentral()
}

paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.MOJANG_PRODUCTION

dependencies {
implementation(project(":wgrp-common"))

//Paper or Folia
paperweight.foliaDevBundle("1.21.11-R0.1-SNAPSHOT")
paperweight.folisDevBundle("26.1.2.build.+")

//Plugins api
compileOnly("net.kyori:adventure-platform-bukkit:4.3.3")
Expand Down Expand Up @@ -171,3 +168,7 @@ fun String.runCommand(): String {
""
}
}

tasks.named("reobfJar") {
enabled = false
}