diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index eb429ea2..1aafae6c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: openjdk:17-jdk options: --user root diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml index 561962a6..e3e2d2d2 100644 --- a/.github/workflows/test-push.yml +++ b/.github/workflows/test-push.yml @@ -10,8 +10,8 @@ jobs: strategy: fail-fast: false matrix: - version: [7.4.0-jdk17] - runs-on: ubuntu-20.04 + version: [7.5.0-jdk17] + runs-on: ubuntu-22.04 container: image: gradle:${{ matrix.version }} options: --user root @@ -25,9 +25,9 @@ jobs: # Lets wait to ensure it builds before going running tests needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: - image: gradle:7.4.0-jdk17 + image: gradle:7.5.0-jdk17 options: --user root steps: @@ -49,7 +49,7 @@ jobs: version: [7.4.0-jdk17] test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: gradle:${{ matrix.version }} options: --user root @@ -100,8 +100,8 @@ jobs: strategy: fail-fast: false matrix: - java: [ 17 ] - os: [ windows-2022, ubuntu-20.04, macos-11 ] + java: [ 17, 18 ] + os: [ windows-2022, ubuntu-22.04, macos-11 ] runs-on: ${{ matrix.os }} steps: diff --git a/build.gradle b/build.gradle index fba12f99..11a683b5 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ plugins { id 'checkstyle' id 'jacoco' id 'codenarc' - id "org.jetbrains.kotlin.jvm" version "1.5.31" // Must match the version included with gradle. - id "com.diffplug.spotless" version "6.3.0" + id "org.jetbrains.kotlin.jvm" version "1.6.10" // Must match the version included with gradle. + id "com.diffplug.spotless" version "6.8.0" } java { @@ -24,7 +24,7 @@ tasks.withType(JavaCompile).configureEach { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { kotlinOptions { - jvmTarget = "16" // Change to 17 when updating gradle/kotlin to 1.6.10 + jvmTarget = "17" } } @@ -106,7 +106,7 @@ dependencies { } // Kapt integration - compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31') // Must match the version included with gradle. + compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10') // Must match the version included with gradle. // Testing testImplementation(gradleTestKit()) @@ -156,11 +156,11 @@ spotless { checkstyle { configFile = file('checkstyle.xml') - toolVersion = '9.3' + toolVersion = '10.3.1' } codenarc { - toolVersion = "2.2.0" + toolVersion = "3.1.0" configFile = file("codenarc.groovy") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d7e66b5c..2ec77e51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java b/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java index 5f2e79b9..08a46c7c 100644 --- a/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java +++ b/src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java @@ -94,7 +94,7 @@ public abstract class ValidateAccessWidenerTask extends DefaultTask { /** * Validates that all entries in an access-widner file relate to a class/method/field in the mc jar. */ - private static record AccessWidenerValidator(TrEnvironment environment) implements AccessWidenerVisitor { + private record AccessWidenerValidator(TrEnvironment environment) implements AccessWidenerVisitor { @Override public void visitClass(String name, AccessWidenerReader.AccessType access, boolean transitive) { if (environment().getClass(name) == null) { diff --git a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy index e98e82a2..78e1cf28 100644 --- a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy @@ -27,7 +27,7 @@ package net.fabricmc.loom.test import org.gradle.util.GradleVersion class LoomTestConstants { - private final static String NIGHTLY_VERSION = "7.6-20220620222921+0000" + private final static String NIGHTLY_VERSION = "7.6-20220722221130+0000" private final static boolean NIGHTLY_EXISTS = nightlyExists(NIGHTLY_VERSION) public final static String DEFAULT_GRADLE = GradleVersion.current().getVersion() diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy index 69bfa93c..14981f93 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy @@ -27,7 +27,7 @@ package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.GradleProjectTestTrait import spock.lang.Specification import spock.lang.Unroll -import com.google.gson.JsonParser; +import com.google.gson.JsonParser import java.util.jar.JarFile import static net.fabricmc.loom.test.LoomTestConstants.STANDARD_TEST_VERSIONS diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy index ff4af2cb..75412ade 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy @@ -54,8 +54,8 @@ class ReproducibleBuildTest extends Specification implements GradleProjectTestTr where: version | modHash | sourceHash - DEFAULT_GRADLE | "ed3306ef60f434c55048cba8de5dab95" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] - PRE_RELEASE_GRADLE | "ed3306ef60f434c55048cba8de5dab95" | ["be31766e6cafbe4ae3bca9e35ba63169", "7348b0bd87d36d7ec6f3bca9c2b66062"] + DEFAULT_GRADLE | "ed3306ef60f434c55048cba8de5dab95" | ["0d9eec9248d93eb6ec4a1cd4d927e609", "436bf54ef015576b0a338d55d9a0bb82"] + PRE_RELEASE_GRADLE | "ed3306ef60f434c55048cba8de5dab95" | ["0d9eec9248d93eb6ec4a1cd4d927e609", "436bf54ef015576b0a338d55d9a0bb82"] } String generateMD5(File file) { diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy index 31677552..073978fc 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/IdeaClasspathModificationsTest.groovy @@ -81,6 +81,9 @@ class IdeaClasspathModificationsTest extends Specification { + + %IDEA_ENV_VARS% + '''.trim() @@ -97,6 +100,9 @@ class IdeaClasspathModificationsTest extends Specification { + + %IDEA_ENV_VARS% + '''.trim()