From 9fd0df824f252e51f9e367e3c7cb2d5f0a625e0b Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Sun, 14 Jan 2024 10:02:16 +0100 Subject: [PATCH 1/2] Update supported Velocity version to 3.3 (#666) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 76fdcfd3..c312ff6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ projectVersion=4.9.2-SNAPSHOT mcVersions=1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10 mcVersionRange=1.10-1.20.3 waterfallVersion=1.20 -velocityVersion=3.2 \ No newline at end of file +velocityVersion=3.3 From b40f77fed32b21b382e1b80afa541b38636514ea Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Sat, 20 Jan 2024 21:19:36 +0100 Subject: [PATCH 2/2] Update JDK to 17, setup-java to v4 (#671) --- .github/workflows/gradle.yml | 6 +++--- .github/workflows/publish.yml | 2 +- velocity/build.gradle.kts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 24380b9f..9fdd6a33 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,11 +13,11 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 11 - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 check-latest: true - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9776da54..7b3bdd78 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index ba4756ac..f50b4813 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { compileOnlyApi(projects.viabackwardsCommon) compileOnly(libs.velocity) { - // Requires Java 11 + // Requires Java 17 exclude("com.velocitypowered", "velocity-brigadier") } annotationProcessor(libs.velocity)