Skip to content

Commit 103013f

Browse files
authored
Update buildscript to 2.x (#156)
1 parent a2a1863 commit 103013f

8 files changed

Lines changed: 32 additions & 12 deletions

File tree

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//version: 1707058017
2-
31
plugins {
42
id 'com.gtnewhorizons.gtnhconvention'
53
}

gradle.properties

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ developmentEnvironmentUserName = Developer
4343
# See https://github.com/bsideup/jabel for details on how this works.
4444
enableModernJavaSyntax = false
4545

46+
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
47+
# and should *not* be used in most situations. -1 disables this.
48+
# forceToolchainVersion = -1
49+
4650
# Enables injecting missing generics into the decompiled source code for a better coding experience.
4751
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
4852
enableGenericInjection = true
@@ -96,7 +100,9 @@ usesMixinDebug = true
96100
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
97101
mixinPlugin =
98102

99-
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
103+
# Specify the package that contains all of your Mixins. The package must exist or
104+
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
105+
# it must match with this or the build will fail.
100106
mixinsPackage = mixins
101107

102108
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -172,6 +178,12 @@ curseForgeRelations =
172178
# projects. New projects should not use this parameter.
173179
# customArchiveBaseName =
174180

181+
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
182+
# runClientWorkingDirectory = run/client
183+
184+
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
185+
# runServerWorkingDirectory = run/server
186+
175187
# Optional parameter to have the build automatically fail if an illegal version is used.
176188
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
177189
# The check is ONLY performed if the version is a git tag.
@@ -204,3 +216,5 @@ disableCheckstyle = true
204216
# Non-GTNH properties
205217
hasMixinDeps = false
206218
mixinPluginMinimumVersion = 0.7.11
219+
org.gradle.configuration-cache = true
220+
org.gradle.parallel = true
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/832229f0f6f0be60ed817c5a5e5848eb/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect
12+
toolchainVersion=25

gradle/wrapper/gradle-wrapper.jar

1.88 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pluginManagement {
3333
}
3434

3535
plugins {
36-
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
36+
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.7'
3737
}
3838

3939

0 commit comments

Comments
 (0)