From a535fd942b399dcbcc44656380a7f90ce9d36b48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Dec 2025 06:37:04 +0000 Subject: [PATCH 1/4] Bump com.wildermods.workspace from 5.2.1.0 to 6.5.1.0 Bumps com.wildermods.workspace from 5.2.1.0 to 6.5.1.0. --- updated-dependencies: - dependency-name: com.wildermods.workspace dependency-version: 6.5.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 28b7685..ca10309 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] wilderforge_version = "0.4.3.0" -workspace_version = "5.2.1.0" +workspace_version = "6.5.1.0" #Define the library by defining its module and version reference. [libraries] From 194ed6d8b8212682776457b65164b2ba5ecbd31f Mon Sep 17 00:00:00 2001 From: Gamebuster Date: Sun, 28 Dec 2025 06:49:04 +0000 Subject: [PATCH 2/4] Upgrade JDK version from 17 to 21 in build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c96de1..95c83e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,10 +53,10 @@ jobs: with: ref: ${{ env.COMMIT_SHA }} - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4.5.0 with: - java-version: '17' + java-version: '21' distribution: 'adopt' - name: Setup Gradle From 1f1174db3e2ba1c2c0f4b8fe34c0469fcffae216 Mon Sep 17 00:00:00 2001 From: Gamebuster19901 Date: Sun, 28 Dec 2025 02:04:06 -0500 Subject: [PATCH 3/4] Update gradle to version 9.2.1 --- build.gradle | 9 ++++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- publishScript.gradle | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 02d3bc4..c59ab96 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { version = modVersion //To change the version of your mod, edit modVersion in gradle.properties group = "com.wildermods" -archivesBaseName = "examplemod" +base.archivesName = "examplemod" apply plugin: 'com.wildermods.workspace' apply from: 'replaceTokenScript.gradle' //see replaceTokenScript.gradle! @@ -20,8 +20,11 @@ repositories { } } -sourceCompatibility = '17' -targetCompatibility = '17' +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} wilderWorkspace { useDependency("1.16+559") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b..23449a2 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.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/publishScript.gradle b/publishScript.gradle index db7107b..d0ac83d 100644 --- a/publishScript.gradle +++ b/publishScript.gradle @@ -12,14 +12,14 @@ tasks.register('checkArtifactExists') { } def repoUrl = project.hasProperty('mavenRepoUrl') ? project.mavenRepoUrl : mavenLocalUrl - def artifactPath = "${repoUrl}/${project.group.replace('.', '/')}/${project.archivesBaseName}/${project.version}/${project.archivesBaseName}-${project.version}.jar" + def artifactPath = "${repoUrl}/${project.group.replace('.', '/')}/${project.base.archivesName}/${project.version}/${project.base.archivesName}-${project.version}.jar" logger.lifecycle("Checking if artifact exists at: $artifactPath") if (artifactPath.startsWith('file:/')) { // Handle file URLs def file = new File(new URI(artifactPath)) if (file.exists()) { - throw new IllegalStateException("Artifact '${project.group}:${project.archivesBaseName}:${project.version}' already exists. Publishing aborted.") + throw new IllegalStateException("Artifact '${project.group}:${project.base.archivesName}:${project.version}' already exists. Publishing aborted.") } } else { // Handle HTTP URLs @@ -27,7 +27,7 @@ tasks.register('checkArtifactExists') { def connection = url.openConnection() connection.setRequestMethod('HEAD') if (connection.responseCode == 200) { - throw new IllegalStateException("Artifact '${project.group}:${project.archivesBaseName}:${project.version}' already exists. Publishing aborted.") + throw new IllegalStateException("Artifact '${project.group}:${project.base.archivesName}:${project.version}' already exists. Publishing aborted.") } } logger.lifecycle("Artifact does not exist, proceeding with publish.") @@ -43,7 +43,7 @@ publishing { mavenJava(MavenPublication) { from components.java groupId = project.group - artifactId = project.archivesBaseName + artifactId = project.base.archivesName version = project.version // Attach sources JAR to the publication From d73dde1de8d90194aa92d99f8b8ac5895b5fd5fc Mon Sep 17 00:00:00 2001 From: Gamebuster19901 Date: Sun, 28 Dec 2025 02:04:36 -0500 Subject: [PATCH 4/4] Add maven repository for vineflower snapshot --- settings.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings.gradle b/settings.gradle index bef7f0e..463e157 100644 --- a/settings.gradle +++ b/settings.gradle @@ -34,6 +34,9 @@ pluginManagement { maven { url 'https://maven.wildermods.com' } + maven { + url 'https://central.sonatype.com/repository/maven-snapshots/' + } } plugins { id 'com.wildermods.workspace' version getVersionFromToml('workspace_version')