mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-14 12:10:30 +00:00
Code Issues Releases Wiki Activity

Bump Forge Gradle version

Browse Source
This commit is contained in:
Jonathan Coates 2021-07-02 21:48:28 +01:00
parent 815e534dc6
commit abb9c14256
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.google.code.gson:gson:2.8.1' classpath 'com.google.code.gson:gson:2.8.1'
classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.12' classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.24'
} }
} }
@ -40,14 +40,6 @@ java {
withJavadocJar() withJavadocJar()
} }
// Tragically java.toolchain.languageVersion doesn't apply to ForgeGradle's
// tasks, so we force all launchers to use the right Java version.
tasks.withType(JavaCompile).configureEach {
javaCompiler = javaToolchains.compilerFor {
languageVersion = javaVersion
}
}
tasks.withType(JavaExec).configureEach { tasks.withType(JavaExec).configureEach {
javaLauncher = javaToolchains.launcherFor { javaLauncher = javaToolchains.launcherFor {
languageVersion = javaVersion languageVersion = javaVersion
@ -305,8 +297,8 @@ test {
jacocoTestReport { jacocoTestReport {
dependsOn('test') dependsOn('test')
reports { reports {
xml.enabled true xml.required = true
html.enabled true html.required = true
} }
} }
@ -370,14 +362,10 @@ tasks.register('testInGame', JavaExec.class).configure {
// Copy from runTestServer. We do it in this slightly odd way as runTestServer // Copy from runTestServer. We do it in this slightly odd way as runTestServer
// isn't created until the task is configured (which is no good for us). // isn't created until the task is configured (which is no good for us).
JavaExec exec = tasks.getByName('runTestServer') JavaExec exec = tasks.getByName('runTestServer')
it.setWorkingDir(exec.getWorkingDir()) exec.copyTo(it)
it.setSystemProperties(exec.getSystemProperties())
it.setBootstrapClasspath(exec.getBootstrapClasspath())
it.setClasspath(exec.getClasspath()) it.setClasspath(exec.getClasspath())
it.setMain(exec.getMain()) it.mainClass = exec.mainClass
it.setEnvironment(exec.getEnvironment())
it.setArgs(exec.getArgs()) it.setArgs(exec.getArgs())
it.setJvmArgs(exec.getJvmArgs())
it.systemProperty('forge.logging.console.level', 'info') it.systemProperty('forge.logging.console.level', 'info')
it.systemProperty('cctest.run', 'true') it.systemProperty('cctest.run', 'true')
@ -464,6 +452,8 @@ curseforge {
relations { relations {
incompatible "computercraft" incompatible "computercraft"
} }
addGameVersion "${mc_version}"
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists