Skip to content

Commit

Permalink
Update gml-core and groovybundler to fix module issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Matyrobbrt committed Nov 14, 2024
1 parent 9174f6d commit 99489cc
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 24 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@
"name": "Checkout",
"uses": "actions/checkout@v4"
},
{
"name": "Validate Gradle Wrapper",
"uses": "gradle/actions/wrapper-validation@v4"
},
{
"with": {
"path": "**/.gradle/loom-cache",
"path": "**/.gradle/loom-cache\n**/.gradle/quilt-loom-cache",
"key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
"restore-keys": "${{ runner.os }}-gradle-"
},
Expand All @@ -31,7 +35,7 @@
"gradle-home-cache-cleanup": true
},
"name": "Setup Gradle",
"uses": "gradle/gradle-build-action@v3"
"uses": "gradle/actions/setup-gradle@v4"
},
{
"uses": "fregante/setup-git-user@v2"
Expand Down
31 changes: 14 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import com.matyrobbrt.gradle.jarinjar.task.ForgeJarInJarTask

plugins {
id 'java-library'
id 'net.neoforged.gradle.userdev' version '7.0.145'
id 'groovy'
id 'signing'
id 'maven-publish'
id 'net.neoforged.moddev' version '2.0.37-beta'
id 'com.matyrobbrt.jarinjar' version '1.2.0'
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 'org.groovymc.modsdotgroovy' version '2.0.0-beta.30'
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
id 'dev.lukebemish.managedversioning' version '1.2.26'
id 'com.modrinth.minotaur' version '2.8.4'
id 'net.darkhax.curseforgegradle' version '1.1.16'
}
Expand Down Expand Up @@ -94,22 +94,19 @@ configurations {

tasks.register('fullJar', ForgeJarInJarTask)

runs {
configureEach {
modSource project.sourceSets.main
}

client {
}

server {
programArgument '--nogui'
}
neoForge {
version = project.neo_version
mods.create('gml') {
sourceSet(sourceSets.main)
}
runs {
client {
client()
}
}
}

dependencies {
implementation "net.neoforged:neoforge:${project.neo_version}"

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

Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
org.gradle.jvmargs=-Xmx2G -XX:+ParallelRefProcEnabled
org.gradle.parallel=true
org.gradle.daemon=false

release_type=release

neo_version=21.0.14-beta
gml_core_version=7.0.0
cgl_version=0.5.1
gml_core_version=7.0.3
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.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit 99489cc

Please sign in to comment.