From f5ac2c8808643e96febaf32e8459bd6a2af71da7 Mon Sep 17 00:00:00 2001 From: rlnt Date: Wed, 21 Feb 2024 16:31:09 +0100 Subject: [PATCH] update gradle and loom, switch workflow distribution --- .github/workflows/build.yml | 2 +- build.gradle.kts | 4 +--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da8df26..226107b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ on: - '**/build.yml' env: - JAVA_DIST: 'zulu' + JAVA_DIST: 'microsoft' JAVA_VERSION: 17 jobs: diff --git a/build.gradle.kts b/build.gradle.kts index d281011..db5a403 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,8 +23,7 @@ val githubUser: String by project plugins { id("architectury-plugin") version "3.4.+" - id("dev.architectury.loom") version "1.3.+" apply false - id("io.github.juuxel.loom-vineflower") version "1.11.0" apply false + id("dev.architectury.loom") version "1.4.+" apply false id("com.github.johnrengelman.shadow") version "8.1.1" apply false java `maven-publish` @@ -63,7 +62,6 @@ allprojects { subprojects { apply(plugin = "architectury-plugin") apply(plugin = "dev.architectury.loom") - apply(plugin = "io.github.juuxel.loom-vineflower") apply(plugin = "maven-publish") base { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3762f15..3c60348 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-8.1.1-bin.zip +distributionUrl = https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase = GRADLE_USER_HOME zipStorePath = wrapper/dists