alexcrea/CustomAnvil
1
1
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-08-28 08:25:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix gradlew and up to 9.7.0, upgrade to java 21 [skip ci]

Browse source 
version bump to 2.0.2
This commit is contained in:
alexcrea 2026-08-16 07:50:34 +02:00
parent 643a5e9a8c
commit 6c4991f852
Signed by: alexcrea
GPG key ID: E59DF23EE2A2266C
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
build.gradle.kts
View file

@ -22,7 +22,7 @@ plugins {
} }
group = "xyz.alexcrea" group = "xyz.alexcrea"
version = "2.0.1" version = "2.0.2"
val isDevBuild = System.getenv("SMALL_COMMIT_HASH") != null val isDevBuild = System.getenv("SMALL_COMMIT_HASH") != null
val isPreRelease = System.getenv("IS_GITHUB_PRERELEASE") == "true" val isPreRelease = System.getenv("IS_GITHUB_PRERELEASE") == "true"
@ -158,8 +158,8 @@ allprojects {
// Set target version // Set target version
tasks.withType<JavaCompile>().configureEach { tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = sourceCompatibility =
"16" // We aim for java 16 for minecraft 1.16.5. even if it not really supported by custom anvil. "21" // We aim for java 21 for minecraft 1.21.0
targetCompatibility = "16" targetCompatibility = "21"
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
@ -167,7 +167,7 @@ allprojects {
kotlin { kotlin {
compilerOptions { compilerOptions {
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2) apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2)
jvmTarget.set(JvmTarget.JVM_16) jvmTarget.set(JvmTarget.JVM_21)
} }
} }
@ -212,7 +212,7 @@ tasks {
exclude("net/kyori/**") exclude("net/kyori/**")
} }
val offlineJar by registering(ShadowJar::class) { val offlineJar = register<ShadowJar>("OfflineJar") {
configureBaseShadow("offline", emptyArray()) configureBaseShadow("offline", emptyArray())
from(sourceSets.main.get().output) from(sourceSets.main.get().output)
@ -226,12 +226,12 @@ tasks {
} }
val sourcesJar by tasks.registering(Jar::class) { val sourcesJar = tasks.register<Jar>("sourcesJar") {
archiveClassifier.set("sources") archiveClassifier.set("sources")
from(kotlin.sourceSets.main.get().kotlin) from(kotlin.sourceSets.main.get().kotlin)
} }
val javadocJar by tasks.registering(Jar::class, fun Jar.() { val javadocJar = tasks.register<Jar>("javadocJar", fun Jar.() {
group = JavaBasePlugin.DOCUMENTATION_GROUP group = JavaBasePlugin.DOCUMENTATION_GROUP
description = "Assembles Javadoc JAR" description = "Assembles Javadoc JAR"
archiveClassifier.set("javadoc") archiveClassifier.set("javadoc")
@ -355,10 +355,9 @@ publishing {
} }
// hangar publish // hangar publish
fun executeGitCommand(vararg command: String): String { fun executeGitCommand(vararg command: String): String {
val byteOut = ByteArrayOutputStream() val byteOut = ByteArrayOutputStream()
exec { providers.exec {
commandLine = listOf("git", *command) commandLine = listOf("git", *command)
standardOutput = byteOut standardOutput = byteOut
} }
@ -395,9 +394,9 @@ hangarPublish {
if(!isOnline) versionName+= "-offline" if(!isOnline) versionName+= "-offline"
version.set(versionName) version.set(versionName)
var releaseChannel = if (isDevBuild || isPreRelease) devChannel else releaseChannel var finalReleaseChannel = if (isDevBuild || isPreRelease) devChannel else releaseChannel
if(releaseChannel == null) return if(finalReleaseChannel == null) return
channel.set(releaseChannel) channel.set(finalReleaseChannel)
changelog.set(changelog(isOnline)) changelog.set(changelog(isOnline))
id.set("CustomAnvil") id.set("CustomAnvil")

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists