From e5b7cb97a807309a2f629ef21dc696fd235be21f Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Tue, 8 Sep 2026 04:06:15 -0400 Subject: [PATCH] Anchor repository root probe - Require the core source tree alongside the settings file when walking up for the repository root, so modded-common tests built inside a loader adapter no longer stop at that adapter's own settings file --- .../test/java/art/arcane/iris/testsupport/ProjectPaths.java | 3 ++- .../java/art/arcane/iris/modded/testsupport/ProjectPaths.java | 3 ++- .../test/java/art/arcane/iris/testsupport/ProjectPaths.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/adapters/bukkit/plugin/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java b/adapters/bukkit/plugin/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java index c63903367..3617450f5 100644 --- a/adapters/bukkit/plugin/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java +++ b/adapters/bukkit/plugin/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java @@ -69,7 +69,8 @@ public final class ProjectPaths { Path current = moduleRoot; while (current != null) { - if (Files.isRegularFile(current.resolve("settings.gradle"))) { + if (Files.isRegularFile(current.resolve("settings.gradle")) + && Files.isDirectory(current.resolve("core/src/main/java"))) { return current; } diff --git a/adapters/modded-common/src/test/java/art/arcane/iris/modded/testsupport/ProjectPaths.java b/adapters/modded-common/src/test/java/art/arcane/iris/modded/testsupport/ProjectPaths.java index 8fb746e94..feab80d42 100644 --- a/adapters/modded-common/src/test/java/art/arcane/iris/modded/testsupport/ProjectPaths.java +++ b/adapters/modded-common/src/test/java/art/arcane/iris/modded/testsupport/ProjectPaths.java @@ -69,7 +69,8 @@ public final class ProjectPaths { Path current = moduleRoot; while (current != null) { - if (Files.isRegularFile(current.resolve("settings.gradle"))) { + if (Files.isRegularFile(current.resolve("settings.gradle")) + && Files.isDirectory(current.resolve("core/src/main/java"))) { return current; } diff --git a/core/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java b/core/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java index c63903367..3617450f5 100644 --- a/core/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java +++ b/core/src/test/java/art/arcane/iris/testsupport/ProjectPaths.java @@ -69,7 +69,8 @@ public final class ProjectPaths { Path current = moduleRoot; while (current != null) { - if (Files.isRegularFile(current.resolve("settings.gradle"))) { + if (Files.isRegularFile(current.resolve("settings.gradle")) + && Files.isDirectory(current.resolve("core/src/main/java"))) { return current; }