From 7e2ddcaad950238272031f2d7e7a51449902f30f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 02:39:31 +0000 Subject: [PATCH 1/4] Bump asm_version from 9.7 to 9.7.1 Bumps `asm_version` from 9.7 to 9.7.1. Updates `org.ow2.asm:asm` from 9.7 to 9.7.1 Updates `org.ow2.asm:asm-analysis` from 9.7 to 9.7.1 Updates `org.ow2.asm:asm-commons` from 9.7 to 9.7.1 Updates `org.ow2.asm:asm-tree` from 9.7 to 9.7.1 Updates `org.ow2.asm:asm-util` from 9.7 to 9.7.1 --- updated-dependencies: - dependency-name: org.ow2.asm:asm dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.ow2.asm:asm-analysis dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.ow2.asm:asm-commons dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.ow2.asm:asm-tree dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.ow2.asm:asm-util dependency-type: direct:production update-type: version-update:semver-patch ... 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 595fb6d..ec25ed6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] fabric_loader_version = "0.16.8" mixin_version = "0.15.4+mixin.0.8.7" -asm_version = "9.7" +asm_version = "9.7.1" commons_lang_version = "3.14.0" [libraries] From 2fd02fc9a4d09f7619d8ea6642d06c72177c8e93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 02:39:35 +0000 Subject: [PATCH 2/4] Bump net.fabricmc:fabric-loader from 0.16.8 to 0.16.9 Bumps net.fabricmc:fabric-loader from 0.16.8 to 0.16.9. --- updated-dependencies: - dependency-name: net.fabricmc:fabric-loader dependency-type: direct:production update-type: version-update:semver-patch ... 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 595fb6d..38328d4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -fabric_loader_version = "0.16.8" +fabric_loader_version = "0.16.9" mixin_version = "0.15.4+mixin.0.8.7" asm_version = "9.7" commons_lang_version = "3.14.0" From c9632b6c302845d7393d1d3f3aae8b5b501c78ea Mon Sep 17 00:00:00 2001 From: Gamebuster19901 Date: Fri, 6 Dec 2024 20:20:24 -0500 Subject: [PATCH 3/4] Fix build and publishing issues --- build.gradle | 75 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index c7ca4bf..611a39c 100644 --- a/build.gradle +++ b/build.gradle @@ -51,33 +51,70 @@ jar { } } -task sourcesJar(type: Jar) { - archiveClassifier.set("sources") - from sourceSets.main.allSource -} - -tasks.build { - dependsOn sourcesJar -} - tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { exclude '**/license.txt' exclude '**/license' exclude '**/notice.txt' exclude '**/notice' - finalizedBy sourcesJar + exclude '**/LICENSE.txt' + exclude '**/LICENSE' + exclude '**/NOTICE.txt' + exclude '**/NOTICE' + finalizedBy sourceJar +} + +ext.mavenLocalUrl = repositories.mavenLocal().url.toString() + +task sourceJar(type: Jar) { + from sourceSets.main.allSource + archiveClassifier.set('sources') +} + +tasks.register('checkArtifactExists') { + doLast { + def repoUrl = project.hasProperty('mavenRepoUrl') ? project.mavenRepoUrl : mavenLocalUrl + def artifactPath = "${repoUrl}/${project.group.replace('.', '/')}/${project.archivesBaseName}/${project.version}/${project.archivesBaseName}-${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.") + } + } else { + // Handle HTTP URLs + def url = new URL(artifactPath) + 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.") + } + } + logger.lifecycle("Artifact does not exist, proceeding with publish.") + } } -artifacts { - archives jar - archives sourcesJar +tasks.named('publish') { + dependsOn 'checkArtifactExists' } publishing { - publications { - mavenJava(MavenPublication) { - from components.java - artifact sourcesJar - } - } + publications { + mavenJava(MavenPublication) { + from components.java + groupId = project.group + artifactId = project.archivesBaseName + version = project.version + + // Attach sources JAR to the publication + artifact sourceJar + } + } + + repositories { + maven { + url = uri(project.hasProperty('mavenRepoUrl') ? project.mavenRepoUrl : mavenLocalUrl) // Default to mavenLocal if no custom URL is provided + } + } } \ No newline at end of file From a2f33578dac1b7a6e84be2e3a0240de81c55ad57 Mon Sep 17 00:00:00 2001 From: Gamebuster19901 Date: Fri, 6 Dec 2024 20:24:46 -0500 Subject: [PATCH 4/4] Version 1.6.0.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index aafa122..1abb1a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -providerVersion = 1.5.0.3 \ No newline at end of file +providerVersion = 1.6.0.0 \ No newline at end of file