Skip to content

Commit

Permalink
Update to 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
lukebemish committed Jun 21, 2024
1 parent b5156ed commit 2f4e9ef
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 21 deletions.
15 changes: 10 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import com.matyrobbrt.gradle.jarinjar.task.ForgeJarInJarTask

plugins {
id 'java-library'
id 'net.neoforged.gradle.userdev' version '7.0.96'
id 'net.neoforged.gradle.userdev' version '7.0.145'
id 'groovy'
id 'signing'
id 'maven-publish'
id 'com.matyrobbrt.jarinjar' version '1.2.0'
id 'org.groovymc.modsdotgroovy' version '2.0.0-beta.16'
id 'org.groovymc.modsdotgroovy' version '2.0.0-beta.29'
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1'
id 'dev.lukebemish.managedversioning' version '1.2.8'
id 'com.modrinth.minotaur' version '2.8.4'
Expand All @@ -20,6 +20,11 @@ base {
archivesName = 'gml'
}

modsDotGroovy.gather {
projectProperty 'cgl_version'
projectProperty 'gml_core_version'
}

java.withSourcesJar()

managedVersioning {
Expand Down Expand Up @@ -57,7 +62,7 @@ managedVersioning.apply()
println "Building: $version"

// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
java.toolchain.languageVersion = JavaLanguageVersion.of(21)

repositories {
mavenCentral()
Expand Down Expand Up @@ -106,12 +111,12 @@ dependencies {
implementation "net.neoforged:neoforge:${project.neo_version}"

expose "org.groovymc.gml:gml-core:${project.gml_core_version}"
expose "org.groovymc.cgl:cgl-1.20.4-neoforge:${project.cgl_version}"
expose "org.groovymc.cgl:cgl-1.21-neoforge:${project.cgl_version}"

include("org.groovymc.gml:gml-core:${project.gml_core_version}") {
transitive = false
}
include("org.groovymc.cgl:cgl-1.20.4-neoforge:${project.cgl_version}") {
include("org.groovymc.cgl:cgl-1.21-neoforge:${project.cgl_version}") {
transitive = false
}
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ org.gradle.daemon=false

release_type=release

neo_version=20.4.196
gml_core_version=5.0.3
cgl_version=0.4.0
neo_version=21.0.14-beta
gml_core_version=7.0.0
cgl_version=0.5.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=5.0.0
version=6.0.0

0 comments on commit 2f4e9ef

Please sign in to comment.