Skip to content

Commit

Permalink
build updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jpenilla committed Jul 23, 2023
1 parent 11ba65a commit aa826d8
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
18 changes: 9 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import io.papermc.hangarpublishplugin.model.Platforms

plugins {
id("com.github.johnrengelman.shadow") version "7.1.2"
id("xyz.jpenilla.run-paper") version "2.0.1"
val indraVer = "3.0.1"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("xyz.jpenilla.run-paper") version "2.1.0"
val indraVer = "3.1.2"
id("net.kyori.indra") version indraVer
id("net.kyori.indra.git") version indraVer
id("net.kyori.indra.license-header") version indraVer
id("io.papermc.hangar-publish-plugin") version "0.0.3"
id("com.modrinth.minotaur") version "2.7.2"
id("io.papermc.hangar-publish-plugin") version "0.0.5"
id("com.modrinth.minotaur") version "2.7.5"
}

decorateVersion()
Expand All @@ -27,15 +27,15 @@ dependencies {
exclude("org.yaml", "snakeyaml")
}
implementation("xyz.niflheim:stockfish-java:4.0.0-SNAPSHOT")
implementation(platform("cloud.commandframework:cloud-bom:1.8.2"))
implementation(platform("cloud.commandframework:cloud-bom:1.8.3"))
implementation("cloud.commandframework:cloud-paper")
compileOnly("com.mojang", "brigadier", "1.0.18")
implementation("cloud.commandframework:cloud-minecraft-extras") {
isTransitive = false
}
implementation("org.spongepowered:configurate-yaml:4.1.2")
runtimeOnly("io.papermc:paper-trail:0.0.1-SNAPSHOT")
implementation("org.bstats", "bstats-bukkit", "3.0.1")
implementation("org.bstats", "bstats-bukkit", "3.0.2")

val cpuFeaturesJniVersion = "1.0.1"
implementation("io.github.aecsocket:cpu-features-jni:$cpuFeaturesJniVersion")
Expand Down Expand Up @@ -64,7 +64,7 @@ tasks {
dependsOn(shadowJar)
}
runServer {
minecraftVersion("1.19.4")
minecraftVersion("1.20.1")
}
processResources {
val props = mapOf(
Expand Down Expand Up @@ -93,7 +93,7 @@ tasks {
}

val releaseNotes = providers.environmentVariable("RELEASE_NOTES")
val versions = listOf("1.19.4")
val versions = listOf("1.19.4", "1.20.1")
val shadowJar = tasks.shadowJar.flatMap { it.archiveFile }

hangarPublish.publications.register("plugin") {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -133,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down Expand Up @@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
}

includeBuild("work/Stockfish-Java")
Expand Down

0 comments on commit aa826d8

Please sign in to comment.