diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a9c84bf..eb429ea 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-20.04 container: - image: openjdk:16-jdk + image: openjdk:17-jdk options: --user root steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml index f1c3b4e..7ef93cc 100644 --- a/.github/workflows/test-push.yml +++ b/.github/workflows/test-push.yml @@ -5,7 +5,7 @@ jobs: strategy: fail-fast: false matrix: - version: [7.0.0-jdk16, 7.2-jdk17] + version: [7.3.1-jdk17] runs-on: ubuntu-20.04 container: image: gradle:${{ matrix.version }} @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: gradle:7.0.1-jdk16 + image: gradle:7.3.1-jdk17 options: --user root steps: @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - version: [7.0.0-jdk16, 7.2-jdk17] + version: [7.3.1-jdk17] test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} runs-on: ubuntu-20.04 @@ -67,10 +67,10 @@ jobs: strategy: fail-fast: false matrix: - java: [16] + java: [17] test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }} - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v2 @@ -95,8 +95,8 @@ jobs: strategy: fail-fast: false matrix: - java: [ 16 ] - os: [ windows-2019, ubuntu-20.04, macos-10.15 ] + java: [ 17 ] + os: [ windows-2022, ubuntu-20.04, macos-11 ] runs-on: ${{ matrix.os }} steps: @@ -111,53 +111,4 @@ jobs: if: ${{ failure() }} with: name: Reproducible Build ${{ matrix.os }} (${{ matrix.java }}) Results - path: build/reports/ - - bootstrap_tests: - needs: build - - strategy: - fail-fast: false - matrix: - java: [ 8, 11, 15, 16 ] - gradle: [ 4.9, 5.2, 6.0.1, 6.9, 7.0.2 ] - exclude: - - java: 16 - gradle: 6.9 - - java: 16 - gradle: 6.0.1 - - java: 16 - gradle: 5.2 - - java: 16 - gradle: 4.9 - - java: 15 - gradle: 6.0.1 - - java: 15 - gradle: 5.2 - - java: 15 - gradle: 4.9 - runs-on: ubuntu-20.04 - container: - image: gradle:7.0.2-jdk16 - options: --user root - - steps: - # Build loom and publish to maven local - - uses: actions/checkout@v2 - - run: gradle build publishToMavenLocal -x test -x check - - - run: gradle wrapper --gradle-version=${{ matrix.gradle }} - working-directory: bootstrap/test-project - - run: gradle --stop - - - uses: actions/setup-java@v2 - with: - java-version: ${{ matrix.java }} - distribution: 'adopt' - - - run: ./gradlew --version - working-directory: bootstrap/test-project - - run: ./gradlew build || true - working-directory: bootstrap/test-project - - # TODO check the output of the previous step here \ No newline at end of file + path: build/reports/ \ No newline at end of file diff --git a/bootstrap/src/main/java/net/fabricmc/loom/bootstrap/LoomGradlePluginBootstrap.java b/bootstrap/src/main/java/net/fabricmc/loom/bootstrap/LoomGradlePluginBootstrap.java index 01feb2c..3badd32 100644 --- a/bootstrap/src/main/java/net/fabricmc/loom/bootstrap/LoomGradlePluginBootstrap.java +++ b/bootstrap/src/main/java/net/fabricmc/loom/bootstrap/LoomGradlePluginBootstrap.java @@ -14,7 +14,7 @@ import org.gradle.util.GradleVersion; @SuppressWarnings("unused") public class LoomGradlePluginBootstrap implements Plugin { private static final int MIN_SUPPORTED_MAJOR_GRADLE_VERSION = 7; - private static final int MIN_SUPPORTED_MAJOR_JAVA_VERSION = 16; + private static final int MIN_SUPPORTED_MAJOR_JAVA_VERSION = 17; private static final int MIN_SUPPORTED_MAJOR_IDEA_VERSION = 2021; private static final String PLUGIN_CLASS_NAME = "net.fabricmc.loom.LoomGradlePlugin"; diff --git a/build.gradle b/build.gradle index 5fa1a1b..439645f 100644 --- a/build.gradle +++ b/build.gradle @@ -11,12 +11,12 @@ plugins { id "com.diffplug.spotless" version "5.14.1" } -sourceCompatibility = 16 -targetCompatibility = 16 +sourceCompatibility = 17 +targetCompatibility = 17 tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" - it.options.release = 16 + it.options.release = 17 } @@ -61,10 +61,10 @@ dependencies { bootstrap project(":bootstrap") // libraries - implementation ('commons-io:commons-io:2.8.0') - implementation ('com.google.code.gson:gson:2.8.8') - implementation ('com.fasterxml.jackson.core:jackson-databind:2.12.5') - implementation ('com.google.guava:guava:30.1.1-jre') + implementation ('commons-io:commons-io:2.11.0') + implementation ('com.google.code.gson:gson:2.8.9') + implementation ('com.fasterxml.jackson.core:jackson-databind:2.13.0') + implementation ('com.google.guava:guava:31.0.1-jre') implementation ('org.ow2.asm:asm:9.2') implementation ('org.ow2.asm:asm-analysis:9.2') implementation ('org.ow2.asm:asm-commons:9.2') @@ -93,7 +93,7 @@ dependencies { implementation ('net.fabricmc:mercury:0.2.4') // Kapt integration - compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21') + compileOnly('org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0') // Testing testImplementation(gradleTestKit()) @@ -103,7 +103,7 @@ dependencies { testImplementation 'io.javalin:javalin:3.13.11' testImplementation 'net.fabricmc:fabric-installer:0.9.0' - compileOnly 'org.jetbrains:annotations:22.0.0' + compileOnly 'org.jetbrains:annotations:23.0.0' } jar { @@ -137,11 +137,11 @@ spotless { checkstyle { configFile = file('checkstyle.xml') - toolVersion = '8.44' + toolVersion = '9.2' } codenarc { - toolVersion = "2.1.0" + toolVersion = "2.2.0" configFile = file("codenarc.groovy") } @@ -155,7 +155,7 @@ gradlePlugin { } jacoco { - toolVersion = "0.8.6" + toolVersion = "0.8.7" } // Run to get test coverage. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d435ce2..3cd8500 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.0.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index dae98a8..dcc3b0e 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -105,7 +105,7 @@ public class Constants { public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.6"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; - public static final String JETBRAINS_ANNOTATIONS = "22.0.0"; + public static final String JETBRAINS_ANNOTATIONS = "23.0.0"; private Versions() { } diff --git a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy index eadb75f..aaca59c 100644 --- a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy @@ -28,7 +28,7 @@ import org.gradle.util.GradleVersion class LoomTestConstants { public final static String DEFAULT_GRADLE = GradleVersion.current().getVersion() - public final static String PRE_RELEASE_GRADLE = "7.4-20211201231918+0000" + public final static String PRE_RELEASE_GRADLE = "7.4-20211203231050+0000" public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE] }