diff --git a/build.gradle b/build.gradle index caf30c7..f90a35e 100644 --- a/build.gradle +++ b/build.gradle @@ -221,7 +221,7 @@ publishing { task writeActionsTestMatrix() { doLast { def testMatrix = [] - file('src/test/groovy/net/fabricmc/loom/test/intergration').eachFile { + file('src/test/groovy/net/fabricmc/loom/test/integration').eachFile { if (it.name.endsWith("Test.groovy")) { if (it.name.endsWith("ReproducibleBuildTest.groovy")) { // This test gets a special case to run across all os's @@ -229,7 +229,7 @@ task writeActionsTestMatrix() { } def className = it.name.replace(".groovy", "") - testMatrix.add("net.fabricmc.loom.test.intergration.${className}") + testMatrix.add("net.fabricmc.loom.test.integration.${className}") } } diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 6552089..45d114e 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -97,6 +97,7 @@ public final class CompileConfiguration { extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project); extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); + extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); } public static void configureCompile(Project p) { diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index eb6576a..544ff8e 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -89,7 +89,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.0"; + public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.1"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String JETBRAINS_ANNOTATIONS = "19.0.0"; diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/AccessWidenerTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/AccessWidenerTest.groovy similarity index 97% rename from src/test/groovy/net/fabricmc/loom/test/intergration/AccessWidenerTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/AccessWidenerTest.groovy index 0cde47a..6b15f47 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/AccessWidenerTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/AccessWidenerTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ArchiveAssertionsTrait import net.fabricmc.loom.test.util.ProjectTestTrait diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/DecompileTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy similarity index 97% rename from src/test/groovy/net/fabricmc/loom/test/intergration/DecompileTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy index fdab32c..b812ff2 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/DecompileTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.Specification diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/KotlinTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy similarity index 97% rename from src/test/groovy/net/fabricmc/loom/test/intergration/KotlinTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy index 6d738a6..3f30adf 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/KotlinTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.IgnoreIf diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/LegacyProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/LegacyProjectTest.groovy similarity index 97% rename from src/test/groovy/net/fabricmc/loom/test/intergration/LegacyProjectTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/LegacyProjectTest.groovy index da40281..3818809 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/LegacyProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/LegacyProjectTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.Specification diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/MavenProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/MavenProjectTest.groovy similarity index 98% rename from src/test/groovy/net/fabricmc/loom/test/intergration/MavenProjectTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/MavenProjectTest.groovy index 6358b7e..ba6ffd7 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/MavenProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/MavenProjectTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ArchiveAssertionsTrait import net.fabricmc.loom.test.util.MockMavenServerTrait diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/MojangMappingsProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/MojangMappingsProjectTest.groovy similarity index 97% rename from src/test/groovy/net/fabricmc/loom/test/intergration/MojangMappingsProjectTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/MojangMappingsProjectTest.groovy index a98fb85..f5d03c7 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/MojangMappingsProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/MojangMappingsProjectTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.Specification diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/MultiProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/MultiProjectTest.groovy similarity index 98% rename from src/test/groovy/net/fabricmc/loom/test/intergration/MultiProjectTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/MultiProjectTest.groovy index 05317dc..68d6a59 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/MultiProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/MultiProjectTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ArchiveAssertionsTrait import net.fabricmc.loom.test.util.ProjectTestTrait diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/ReproducibleBuildTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy similarity index 98% rename from src/test/groovy/net/fabricmc/loom/test/intergration/ReproducibleBuildTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy index ef9a914..1860450 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/ReproducibleBuildTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import com.google.common.hash.HashCode import com.google.common.hash.Hashing diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/RunConfigTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/RunConfigTest.groovy similarity index 97% rename from src/test/groovy/net/fabricmc/loom/test/intergration/RunConfigTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/RunConfigTest.groovy index 6ffb113..acd6880 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/RunConfigTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/RunConfigTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.Specification diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/SimpleProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy similarity index 97% rename from src/test/groovy/net/fabricmc/loom/test/intergration/SimpleProjectTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy index 8be2504..e300bd3 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/SimpleProjectTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ProjectTestTrait import spock.lang.Specification diff --git a/src/test/groovy/net/fabricmc/loom/test/intergration/UnpickTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy similarity index 98% rename from src/test/groovy/net/fabricmc/loom/test/intergration/UnpickTest.groovy rename to src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy index da1de2d..2be479e 100644 --- a/src/test/groovy/net/fabricmc/loom/test/intergration/UnpickTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.test.intergration +package net.fabricmc.loom.test.integration import net.fabricmc.loom.test.util.ProjectTestTrait import org.zeroturnaround.zip.ZipUtil