Drop minor versions and improve/update build gradle

build-logic/src/main/kotlin/extensions.kt

@@ -35,9 +35,9 @@ fun Project.branchName(): String {
 
 fun Project.runGitCommand(args: List<String>): String {
     val byteOut = ByteArrayOutputStream()
-    exec {
-        commandLine = listOf("git") + args
-        standardOutput = byteOut
-    }
+//    exec {
+//        commandLine = listOf("git") + args
+//        standardOutput = byteOut
+//    }
     return byteOut.toString(Charsets.UTF_8.name()).trim()
 }

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     alias(libs.plugins.publishdata)
     alias(libs.plugins.shadow)
     alias(libs.plugins.paper.run)
-    alias(libs.plugins.bukkit.yml)
+    alias(libs.plugins.paper.yml)
     alias(libs.plugins.hangar)
     alias(libs.plugins.modrinth)
     id("olf.build-logic")
@@ -27,15 +27,9 @@ if (!File("$rootDir/.git").exists()) {
 group = "net.onelitefeather"
 version = "1.4.0"
 
-val minecraftVersion = "1.20.6"
 val supportedMinecraftVersions = listOf(
-    "1.20",
-    "1.20.1",
-    "1.20.2",
-    "1.20.3",
-    "1.20.4",
-    "1.20.5",
     "1.20.6",
+    "1.21"
 )
 
 repositories {
@@ -44,29 +38,24 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
-    implementation("net.kyori:adventure-text-minimessage:4.24.0")
+    compileOnly(libs.paper)
+    implementation(libs.adventure.minimessage)
     implementation("com.github.zafarkhaja:java-semver:0.10.2")
 
     // testing
     testImplementation(kotlin("test"))
-    testImplementation("io.papermc.paper:paper-api:$minecraftVersion-R0.1-SNAPSHOT")
-    testImplementation("com.github.seeseemelk:MockBukkit-v1.19:3.1.0")
-    testImplementation("io.mockk:mockk:1.14.5")
+    testImplementation(libs.paper)
+    testImplementation(libs.mock.bukkit)
+    testImplementation(libs.mockk)
 }
 
 kotlin {
     jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(21))
     }
-    sourceSets.all {
-        languageSettings {
-            languageVersion = "2.0"
-        }
-    }
 }
 
-bukkit {
+paper {
     main = "dev.themeinerlp.attollo.Attollo"
     apiVersion = "1.20"
     authors = listOf("TheMeinerLP")
@@ -82,11 +71,6 @@ bukkit {
             default = Default.OP
         }
     }
-    commands {
-        register("attollo") {
-            permission = "attollo.command.attollo"
-        }
-    }
 }
 
 publishData {
@@ -120,13 +104,6 @@ tasks {
             pluginJars(rootProject.tasks.shadowJar.map { it.archiveFile }.get())
         }
     }
-    register<RunServer>("runFolia") {
-        downloadsApiService.set(xyz.jpenilla.runtask.service.DownloadsAPIService.folia(project))
-        minecraftVersion(minecraftVersion)
-        group = "run paper"
-        runDirectory.set(file("run-folia"))
-        jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
-    }
 }
 
 val branch = rootProject.branchName()
@@ -169,7 +146,6 @@ if (!isRelease || isMainBranch) { // Only publish releases from the main branch
         uploadFile.set(tasks.shadowJar.flatMap { it.archiveFile })
         gameVersions.addAll(supportedMinecraftVersions)
         loaders.add("paper")
-        loaders.add("bukkit")
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle.kts

@@ -1,9 +1,9 @@
 rootProject.name = "Attollo"
 pluginManagement {
     repositories {
+        gradlePluginPortal()
         mavenCentral()
         maven("https://eldonexus.de/repository/maven-public/")
-        gradlePluginPortal()
     }
 }
 includeBuild("build-logic")
@@ -16,12 +16,22 @@ dependencyResolutionManagement {
             version("hangar", "0.1.3")
             version("bukkit.yml", "0.6.0")
             version("paper.run", "2.3.1")
-            version("shadow", "9.0.0-beta15")
+            version("shadow", "9.0.1")
+            version("paper", "1.21-R0.1-SNAPSHOT")
+            version("paper.yml", "0.7.1")
+            version("adventure", "4.17.0")
+            version("mockk", "1.13.11")
+            version("mock.bukkit", "3.9.0")
+
+            library("paper", "io.papermc.paper", "paper-api").versionRef("paper")
+            library("adventure.minimessage", "net.kyori", "adventure-text-minimessage").versionRef("adventure")
+            library("mockk", "io.mockk", "mockk").versionRef("mockk")
+            library("mock.bukkit", "com.github.seeseemelk", "MockBukkit-v1.20").versionRef("mock.bukkit")
 
             plugin("publishdata","de.chojo.publishdata").versionRef("publishdata")
             plugin("modrinth", "com.modrinth.minotaur").versionRef("modrinth")
             plugin("hangar", "io.papermc.hangar-publish-plugin").versionRef("hangar")
-            plugin("bukkit.yml", "net.minecrell.plugin-yml.bukkit").versionRef("bukkit.yml")
+            plugin("paper.yml", "de.eldoria.plugin-yml.paper").versionRef("paper.yml")
             plugin("paper.run", "xyz.jpenilla.run-paper").versionRef("paper.run")
             plugin("shadow", "com.gradleup.shadow").versionRef("shadow")
         }