From 7fab91f6e34115cefe93186aa5a1ec104fe00fc5 Mon Sep 17 00:00:00 2001 From: zenfyr Date: Wed, 8 Jul 2026 14:37:16 +0700 Subject: [PATCH] build: update to match pulsar --- build.gradle | 27 ++++++++++++++++----------- gradle.properties | 3 ++- gradle/libs.versions.toml | 4 ++-- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 5978cc3..745d62e 100644 --- a/build.gradle +++ b/build.gradle @@ -20,12 +20,12 @@ base { archivesName = project.archives_base_name } -apply from: "https://raw.githubusercontent.com/constellation-mc/artifacts/main/artifacts.groovy" -constellationRepo(project, "dark-matter") -anyGitHubRepo(project, "zenfyrdev", "EvalEx") - repositories { mavenLocal() + maven { + url = 'https://maven.zenfyr.dev/' + content { includeGroup('dev.zenfyr') } + } maven { url 'https://jitpack.io' } } @@ -209,7 +209,11 @@ sourcesJar { from delombok } -// configure the maven publication +def s3Endpoint = project.findProperty("s3AccessKeyId") ?: System.getenv("S3_ENDPOINT") +if (s3Endpoint) { + System.setProperty("org.gradle.s3.endpoint", s3Endpoint) +} + publishing { publications { mavenJava(MavenPublication) { @@ -217,14 +221,15 @@ publishing { } } - if (!local) { + if (s3Endpoint) { repositories { maven { - name = "GitHubPackages" - url = "https://maven.pkg.github.com/constellation-mc/commander" - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") + name = "MavenS3" + url = "s3://maven" + + credentials(AwsCredentials) { + accessKey = project.findProperty("s3AccessKeyId") ?: System.getenv("S3_ACCESS_KEY_ID") + secretKey = project.findProperty("s3SecretAccessKey") ?: System.getenv("S3_SECRET_ACCESS_KEY") } } } diff --git a/gradle.properties b/gradle.properties index 9a7760c..5800935 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,11 @@ org.gradle.jvmargs=-Xmx1G org.gradle.daemon=true org.gradle.caching=true +systemProp.aws.java.v1.disableDeprecationAnnouncement=true # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.20.1 # Mod Properties -mod_version=0.9.0 +mod_version=1.0.0 maven_group=dev.zenfyr archives_base_name=commander diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cf3d2f4..3286f9c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [libraries] fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version = "0.19.2" } fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.92.8+1.20.1" } -evalx = { group = "dev.zenfyr", name = "evalex", version = "5.0.0-local" } +evalx = { group = "dev.zenfyr", name = "evalex", version = "5.0.0" } mapping-io = { group = "net.fabricmc", name = "mapping-io", version = "0.8.0" } -pulsar = { group = "dev.zenfyr", name = "pulsar", version = "0.3.0-1.20.1-build.26" } +pulsar = { group = "dev.zenfyr", name = "pulsar-fabric", version = "1.0.1+mc1.20.1" } assertj-core = { module = "org.assertj:assertj-core", version = "3.26.3" } mockito-core = { module = "org.mockito:mockito-core", version = "5.14.2" } -- 2.51.2