Skip to content

Commit 5552450

Browse files
committed
RFG v2に対応とJDKを25に引き上げ
1 parent 8638c0c commit 5552450

9 files changed

Lines changed: 66 additions & 305 deletions

File tree

.github/actions/build_setup/action.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ runs:
1111
using: 'composite'
1212

1313
steps:
14-
- name: Set up JDK 8 and 17
14+
# RetroFuturaGradle 2.x requires a Java 25 JDK to run the Gradle daemon.
15+
# The last listed version becomes JAVA_HOME (used by the daemon); 8 stays
16+
# available as a compilation toolchain. Jabel runs on the Java 25 toolchain.
17+
- name: Set up JDK 8 and 25
1518
uses: actions/setup-java@v5
1619
with:
1720
cache: gradle
1821
distribution: 'zulu'
1922
java-version: |
2023
8
21-
17
24+
25
2225
2326
- name: Setup Gradle
2427
uses: gradle/actions/setup-gradle@v5

build.gradle

Lines changed: 31 additions & 270 deletions
Large diffs are not rendered by default.

buildscript.properties

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,13 @@ developmentEnvironmentUserName = Developer
4141
# Example value: -Dmixin.debug.verify=true;-XX:+UnlockExperimentalVMOptions
4242
additionalJavaArguments =
4343

44-
# Enables using modern java syntax (up to version 17) via Jabel, while still targeting JVM 8.
44+
# Enables using modern java syntax via Jabel, while still targeting JVM 8.
4545
# See https://github.com/bsideup/jabel for details on how this works.
46-
# Using this requires that you use a Java 17 JDK for development.
46+
# RetroFuturaGradle 2.x requires a Java 25 JDK, which is also used as the compilation toolchain.
47+
# Byte Buddy (used by Jabel) needs '-Dnet.bytebuddy.experimental=true' (set in gradle.properties)
48+
# to run on Java 25. The produced jar still targets Java 8 bytecode.
4749
enableModernJavaSyntax = true
4850

49-
# Enables runClient/runServer tasks for Java 17 and Java 21 using LWJGL3ify.
50-
# This is primarily used to test if your mod is compatible with platforms running
51-
# Minecraft 1.12.2 on modern versions of Java and LWJGL, and assist in fixing any problems with it.
52-
# Using this requires that you use a Java 17/Java 21 JDK for development.
53-
enableJava17RunTasks = false
54-
5551
# Generate a class with String fields for the mod id, name and version named with the fields below
5652
generateGradleTokenClass = com.github.gtexpert.testmod.Tags
5753
gradleTokenModId = MODID
@@ -74,7 +70,7 @@ accessTransformersFile =
7470
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
7571
usesMixins = false
7672
# Mixin Provider to use. Primarily changed when needing to use a different version.
77-
mixinProviderSpec = zone.rong:mixinbooter:10.6
73+
mixinProviderSpec = zone.rong:mixinbooter:10.7
7874
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
7975
mixinsPackage =
8076
# Location of the mixin config refmap. If left, blank, defaults to "mixins.${modId}.refmap.json". Target file must have the "json" extension.

gradle.properties

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,10 @@
1010
org.gradle.logging.stacktrace = all
1111
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
1212
# This is required to provide enough memory for the Minecraft decompilation process.
13-
org.gradle.jvmargs = -Xmx3G
13+
org.gradle.jvmargs = -Xmx3G -Dnet.bytebuddy.experimental=true
14+
# Run independent tasks in parallel to speed up builds.
15+
org.gradle.parallel = true
16+
# Reuse outputs from previous builds via the build cache.
17+
org.gradle.caching = true
18+
# NOTE: configuration-cache is intentionally left disabled. This buildscript resolves git
19+
# information (gitVersion()/runShell) at configuration time, which is incompatible with it.

gradle/wrapper/gradle-wrapper.jar

2.08 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.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 8 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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ pluginManagement {
22
repositories {
33
maven {
44
// RetroFuturaGradle
5-
name 'GTNH Maven'
6-
url 'https://nexus.gtnewhorizons.com/repository/public/'
5+
name = 'GTNH Maven'
6+
url = 'https://nexus.gtnewhorizons.com/repository/public/'
77
//noinspection GroovyAssignabilityCheck
88
mavenContent {
99
includeGroup 'com.gtnewhorizons'
@@ -17,19 +17,19 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id 'com.diffplug.blowdryerSetup' version '1.7.0'
20+
id 'com.diffplug.blowdryerSetup' version '1.7.1'
2121
// Automatic toolchain provisioning
22-
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
23-
id 'com.gradle.enterprise' version '3.18.1'
22+
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
23+
id 'com.gradle.develocity' version '3.19'
2424
}
2525

26-
gradleEnterprise {
27-
if (System.getenv("CI") != null) {
28-
buildScan {
29-
publishAlways()
30-
termsOfServiceUrl = "https://gradle.com/terms-of-service"
31-
termsOfServiceAgree = "yes"
32-
}
26+
develocity {
27+
buildScan {
28+
termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
29+
termsOfUseAgree = "yes"
30+
// Only publish a build scan in CI; locally the terms are still accepted
31+
// so the daemon never blocks on the interactive "Do you accept?" prompt.
32+
publishing.onlyIf { System.getenv("CI") != null }
3333
}
3434
}
3535

0 commit comments

Comments
 (0)