From 822d8431eb938e9e1a98c26e3f991ea49b3b0e8f Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 15 Jun 2025 17:31:09 -0700 Subject: [PATCH 1/7] stupidity --- build.gradle | 17 ++++++++++++++++- gradle/libs.versions.toml | 2 +- settings.gradle | 13 ++++++++++++- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 836936a..0349516 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,29 @@ +buildscript { + repositories { + gradlePluginPortal() + maven { + url = "https://repo.stellardrift.ca/maven/snapshots/" + name = "stellardriftSnapshots" + mavenContent { snapshotsOnly() } + } + } + dependencies { + classpath libs.spotless + } +} + plugins { alias libs.plugins.indra alias libs.plugins.indra.checkstyle alias libs.plugins.indra.publishing.sonatype - alias libs.plugins.spotless alias libs.plugins.indra.licenser.spotless alias libs.plugins.indra.crossdoc alias libs.plugins.nexusPublish id 'eclipse' } +apply plugin: "com.diffplug.spotless" + dependencies { compileOnlyApi libs.jetbrainsAnnotations testImplementation platform(libs.junit.bom) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c2a751b..7628133 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,7 @@ junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } junit-launcher = { module = "org.junit.platform:junit-platform-launcher" } stylecheck = { module = "ca.stellardrift:stylecheck", version = "0.2.1" } jansi = { module = "org.fusesource.jansi:jansi", version = "2.4.1" } +spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.22.0-no-1837-SNAPSHOT" } # unused, for renovate zCheckstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" } @@ -25,4 +26,3 @@ indra-crossdoc = { id = "net.kyori.indra.crossdoc", version.ref = "indra" } indra-licenser-spotless = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" } indra-publishing-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" } nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-1" } -spotless = "com.diffplug.spotless:6.21.0" \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f0ee692..fde0498 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,14 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + url = "https://repo.stellardrift.ca/maven/snapshots/" + name = "stellardriftSnapshots" + mavenContent { snapshotsOnly() } + } + } +} + plugins { id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0" } @@ -9,4 +20,4 @@ dependencyResolutionManagement { } } -rootProject.name = "ansi" \ No newline at end of file +rootProject.name = "ansi" From 114fcab29ed3bf7670b6481b23c04b28eccdfb4a Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 15 Jun 2025 17:36:48 -0700 Subject: [PATCH 2/7] try without 1838 as well --- 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 7628133..7e2eb56 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } junit-launcher = { module = "org.junit.platform:junit-platform-launcher" } stylecheck = { module = "ca.stellardrift:stylecheck", version = "0.2.1" } jansi = { module = "org.fusesource.jansi:jansi", version = "2.4.1" } -spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.22.0-no-1837-SNAPSHOT" } +spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.22.0-no-1838-SNAPSHOT" } # unused, for renovate zCheckstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" } From 7bfab2c20900d9c61e276d6314fc7edb4797b7b1 Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 15 Jun 2025 18:28:19 -0700 Subject: [PATCH 3/7] It's #1837, see if it's fixed on latest by reverting this too --- 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 7e2eb56..3baa031 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } junit-launcher = { module = "org.junit.platform:junit-platform-launcher" } stylecheck = { module = "ca.stellardrift:stylecheck", version = "0.2.1" } jansi = { module = "org.fusesource.jansi:jansi", version = "2.4.1" } -spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.22.0-no-1838-SNAPSHOT" } +spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.0.5-no-1837-SNAPSHOT" } # unused, for renovate zCheckstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" } From 22b118f26b11b121dd9c584770d41fc01a3996d4 Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 15 Jun 2025 18:41:21 -0700 Subject: [PATCH 4/7] try this? --- .github/workflows/build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33520a9..578bae0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,15 @@ on: pull_request: jobs: + get-gitconfig: + runs-on: windows-latest + steps: + - uses: KyoriPowered/.github/.github/actions/setup-java-env@trunk + - shell: bash + run: | + CONF=$(GIT_EDITOR=echo git config --system --edit) + echo "Config is $CONF" + cat $CONF call-build: uses: KyoriPowered/.github/.github/workflows/shared-ci.yaml@trunk secrets: inherit From e9b049657d6ada60801e18554f30ccae2a62c286 Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 15 Jun 2025 18:43:01 -0700 Subject: [PATCH 5/7] bah --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 578bae0..4dc92ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,9 @@ jobs: runs-on: windows-latest steps: - uses: KyoriPowered/.github/.github/actions/setup-java-env@trunk + with: + runtime_version: 17 + publishing_branch_regex: "trunk" - shell: bash run: | CONF=$(GIT_EDITOR=echo git config --system --edit) From 2cab32062cc04fe2493604982373edb8c1ea70bf Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 15 Jun 2025 18:44:22 -0700 Subject: [PATCH 6/7] bah x2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dc92ce..78721b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: run: | CONF=$(GIT_EDITOR=echo git config --system --edit) echo "Config is $CONF" - cat $CONF + cat "$CONF" call-build: uses: KyoriPowered/.github/.github/workflows/shared-ci.yaml@trunk secrets: inherit From 9f2e4a7cf0be4ddc05f48d3ea5ed777bd0c33d63 Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 15 Jun 2025 20:43:57 -0700 Subject: [PATCH 7/7] try this awful fix attempt --- 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 3baa031..7e808a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } junit-launcher = { module = "org.junit.platform:junit-platform-launcher" } stylecheck = { module = "ca.stellardrift:stylecheck", version = "0.2.1" } jansi = { module = "org.fusesource.jansi:jansi", version = "2.4.1" } -spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.0.5-no-1837-SNAPSHOT" } +spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.0.5-stellardrift-SNAPSHOT" } # unused, for renovate zCheckstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }