From 742ee38d3e5129e4f92c3797f2d07432bffe101e Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Mon, 18 Aug 2025 12:34:50 -0700 Subject: [PATCH] Update indra to 4.0.0-SNAPSHOT --- build-logic/build.gradle | 2 +- build-logic/settings.gradle | 5 +++++ .../org.spongepowered.configurate.build.component.gradle | 6 +++--- gradle/libs.versions.toml | 2 +- settings.gradle | 5 +++++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/build-logic/build.gradle b/build-logic/build.gradle index ce1b15c73..4555bab19 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -6,7 +6,7 @@ plugins { id 'codenarc' } -def javaTarget = 11 +def javaTarget = 17 java { def javaVersion = JavaVersion.toVersion(javaTarget) sourceCompatibility = javaVersion diff --git a/build-logic/settings.gradle b/build-logic/settings.gradle index f9e82e0e8..6241270f6 100644 --- a/build-logic/settings.gradle +++ b/build-logic/settings.gradle @@ -5,6 +5,11 @@ pluginManagement { url = "https://repo.stellardrift.ca/repository/internal/" mavenContent { releasesOnly() } } + maven { + name = "papermcSnapshots" + url = "https://repo.papermc.io/repository/maven-snapshots/" + mavenContent { snapshotsOnly() } + } } } diff --git a/build-logic/src/main/groovy/org.spongepowered.configurate.build.component.gradle b/build-logic/src/main/groovy/org.spongepowered.configurate.build.component.gradle index 53d87d483..24ab30148 100644 --- a/build-logic/src/main/groovy/org.spongepowered.configurate.build.component.gradle +++ b/build-logic/src/main/groovy/org.spongepowered.configurate.build.component.gradle @@ -248,9 +248,9 @@ def apiDiffPrevious = configurations.register("apiDiffPrevious") { defaultDependencies { // create based on git's previous tag - def tags = indraGit.tags() - if (tags) { - add(project.dependencies.create("$group:configurate-${project.name}:${Repository.shortenRefName(tags.last().name)}")) + def tags = indraGit.tagNames().get() + if (!tags.isEmpty()) { + add(project.dependencies.create("$group:configurate-${project.name}:${tags.last()}")) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 21fb725be..b37ec78f9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ checkerQual="3.49.5" checkstyle="10.26.1" geantyref = "1.3.16" errorprone="2.41.0" -indra = "3.2.0" +indra = "4.0.0-SNAPSHOT" junit="5.13.4" ktlint="0.49.1" ktfmt="0.56" diff --git a/settings.gradle b/settings.gradle index 95ef513a1..a35579605 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,11 @@ pluginManagement { url = "https://repo.stellardrift.ca/maven/internal/" mavenContent { releasesOnly() } } + maven { + name = "papermcSnapshots" + url = "https://repo.papermc.io/repository/maven-snapshots/" + mavenContent { snapshotsOnly() } + } } }