diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68a153e..9c19b65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,8 @@ name: Build on: push: - branches: [ "*" ] - tags-ignore: [ "*" ] + branches: [ "**" ] + tags-ignore: [ "**" ] pull_request: jobs: @@ -15,13 +15,14 @@ jobs: java: [ 17 ] fail-fast: true steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1 + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v2 - name: JDK ${{ matrix.java }} - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'temurin' cache: 'gradle' + - uses: gradle/actions/setup-gradle@v3 - name: Build run: ./gradlew build --stacktrace diff --git a/build.gradle.kts b/build.gradle.kts index 785e61e..f9f4fa4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - val indraVer = "3.1.2" + val indraVer = "3.1.3" id("net.kyori.indra") version indraVer id("net.kyori.indra.checkstyle") version indraVer id("net.kyori.indra.publishing") version indraVer @@ -22,16 +22,16 @@ allprojects { dependencies { if ("-runtime" !in project.name) { - val asm = "org.ow2.asm:asm:9.5" + val asm = "org.ow2.asm:asm:9.6" api(asm) testImplementation(asm) } - val checker = "org.checkerframework:checker-qual:3.37.0" + val checker = "org.checkerframework:checker-qual:3.42.0" compileOnlyApi(checker) testCompileOnly(checker) - val junitVer = "5.9.3" + val junitVer = "5.10.2" testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVer") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVer") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle.kts b/settings.gradle.kts index 78f4b82..25b067a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + rootProject.name = "reflection-rewriter" include("proxy-generator")