Skip to content

Commit

Permalink
Update to the latest NeoGradle (#1518)
Browse files Browse the repository at this point in the history
  • Loading branch information
marchermans committed Sep 8, 2024
1 parent 0f411dd commit 84794f3
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 11 deletions.
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions 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 @@ -55,7 +57,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 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
4 changes: 2 additions & 2 deletions projects/neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ runs {
gameTestServer { }
gameTestClient { }
data {
programArguments.addAll '--mod', 'neoforge'
arguments.addAll '--mod', 'neoforge'

modSources.add project.sourceSets.main

Expand All @@ -209,7 +209,7 @@ runs.configureEach { it ->
gameDir.mkdirs();

it.workingDirectory.set gameDir
it.programArguments.addAll '--gameDir', gameDir.absolutePath
it.arguments.addAll '--gameDir', gameDir.absolutePath
}

launcherProfile {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pluginManagement {
}

plugins {
id 'net.neoforged.gradle.platform' version '7.0.150'
id 'net.neoforged.gradle.platform' version '7.0.163'
}

rootProject.name = rootDir.name
Expand Down
11 changes: 6 additions & 5 deletions tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ runs {
data {
configure neoforgeProject.runTypes.data

programArguments.addAll '--flat', '--all', '--validate',
arguments.addAll '--flat', '--all', '--validate',
'--mod', 'data_gen_test',
'--mod', 'global_loot_test',
'--mod', 'scaffolding_test',
Expand All @@ -90,24 +90,25 @@ runs {
gameDir.mkdirs();

workingDirectory.set gameDir
programArguments.addAll '--gameDir', gameDir.absolutePath
arguments.addAll '--gameDir', gameDir.absolutePath
}
}

//We need the assets and natives tasks from the forge project.
runs.configureEach {
dependsOn(neoforgeProject.runtime.assets, neoforgeProject.runtime.natives)
dependsOn.add(neoforgeProject.runtime.assets)
dependsOn.add(neoforgeProject.runtime.natives)
modSource neoforgeProject.sourceSets.main
modSource testframeworkProject.sourceSets.main
}

afterEvaluate {
runs.data {
// Override --output that forge already has
def args = new ArrayList<String>(programArguments.get());
def args = new ArrayList<String>(arguments.get());
def outputIndex = args.indexOf('--output');
args.set(outputIndex+1, file('src/generated/resources/').absolutePath);
programArguments.set(args);
arguments.set(args);
}
runs.junit.modSources.all().get().values().remove(sourceSets.main)
}
Expand Down

0 comments on commit 84794f3

Please sign in to comment.