From 0e4c54b05e428a4123731ea5b478e8986c1f5254 Mon Sep 17 00:00:00 2001 From: screret <68943070+screret@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:29:43 +0200 Subject: [PATCH] y u no build --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 2a8a6410..d28d6740 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } apply plugin: "dev.architectury.loom" -apply plugin: "io.github.juuxel.loom-vineflower" +//apply plugin: "io.github.juuxel.loom-vineflower" apply plugin: "java" apply plugin: "architectury-plugin" apply plugin: "maven-publish" @@ -20,9 +20,9 @@ String buildNumber = System.getenv("GITHUB_ACTION_NUMBER") version = "${mod_version}" + (buildNumber != null ? "-build_${System.getenv("GITHUB_RUN_NUMBER")}" : "") -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { options.encoding = "UTF-8" - options.release = 17 + options.release.set 17 } java { @@ -206,7 +206,7 @@ components.java { publishing { publications { mavenForge(MavenPublication) { - artifactId = rootProject.mod_id + "-" + project.name + artifactId = archivesBaseName from components.java } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84a0b92f..db9a6b82 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.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index d7962750..1459c564 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,7 +31,7 @@ dependencyResolutionManagement { def parchmentVersion = "2023.09.03" // https://parchmentmc.org/docs/getting-started def shadowVersion = "7.1.2" def architecturyPluginVersion = "3.4-SNAPSHOT" - def architecturyLoomVersion = "1.3-SNAPSHOT" + def architecturyLoomVersion = "1.4-SNAPSHOT" def vineFlowerVersion = "1.+" def macheteVersion = "1.+" def configurationVersion = "2.2.0"