From 816ed93d7af383eade2bd4b96c694cd0babb6753 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 9 Apr 2021 20:44:18 +0100 Subject: [PATCH 1/6] Fix typo --- build.gradle | 4 ++-- .../{intergration => integration}/AccessWidenerTest.groovy | 2 +- .../test/{intergration => integration}/DecompileTest.groovy | 2 +- .../loom/test/{intergration => integration}/KotlinTest.groovy | 2 +- .../{intergration => integration}/LegacyProjectTest.groovy | 2 +- .../{intergration => integration}/MavenProjectTest.groovy | 2 +- .../MojangMappingsProjectTest.groovy | 2 +- .../{intergration => integration}/MultiProjectTest.groovy | 2 +- .../ReproducibleBuildTest.groovy | 2 +- .../test/{intergration => integration}/RunConfigTest.groovy | 2 +- .../{intergration => integration}/SimpleProjectTest.groovy | 2 +- .../loom/test/{intergration => integration}/UnpickTest.groovy | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/AccessWidenerTest.groovy (97%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/DecompileTest.groovy (97%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/KotlinTest.groovy (97%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/LegacyProjectTest.groovy (97%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/MavenProjectTest.groovy (98%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/MojangMappingsProjectTest.groovy (97%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/MultiProjectTest.groovy (98%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/ReproducibleBuildTest.groovy (98%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/RunConfigTest.groovy (97%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/SimpleProjectTest.groovy (97%) rename src/test/groovy/net/fabricmc/loom/test/{intergration => integration}/UnpickTest.groovy (98%) diff --git a/build.gradle b/build.gradle index 7e1216a..0255035 100644 --- a/build.gradle +++ b/build.gradle @@ -214,7 +214,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 @@ -222,7 +222,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/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 4e4c182..20dc162 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 a2d2ec0..ed85674 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.Specification 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 6187f02..73dc8a9 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 8bcac7b..8a98325 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 From 83eaa0e340e88673974f5f2bb08837e72f8d3c6f Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 10 Apr 2021 00:07:44 +0100 Subject: [PATCH 2/6] Update to run tests against gradle 7.0 release --- .../groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy index 619973e..0017786 100644 --- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy @@ -30,7 +30,7 @@ import org.gradle.testkit.runner.GradleRunner trait ProjectTestTrait { final static String LEGACY_GRADLE = "4.9" final static String DEFAULT_GRADLE = "6.8.3" - final static String PRE_RELEASE_GRADLE = "7.0-rc-2" + final static String PRE_RELEASE_GRADLE = "7.0" static File gradleHome = File.createTempDir() File testProjectDir = File.createTempDir() From 12ac6cfcfe94fc3dd7029b18207b61c27effdea4 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 14 Apr 2021 20:45:17 +0100 Subject: [PATCH 3/6] Update mixin-compile-extensions --- src/main/java/net/fabricmc/loom/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index beff10d..8189e91 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,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"; From 1d009e155ea6cea6b89fb6a0eed9bc0c31309630 Mon Sep 17 00:00:00 2001 From: ByMartrixX <47987888+ByMartrixx@users.noreply.github.com> Date: Wed, 21 Apr 2021 03:51:56 -0400 Subject: [PATCH 4/6] Add loom development dependencies to test runtime classpath (#389) --- .../net/fabricmc/loom/configuration/CompileConfiguration.java | 1 + 1 file changed, 1 insertion(+) 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) { From b85659640d74b534af9c391fffaf6cd62c501292 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 27 Apr 2021 13:12:01 +0100 Subject: [PATCH 5/6] Update MCE --- src/main/java/net/fabricmc/loom/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index 8189e91..7ca9659 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.1"; + public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.2"; 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"; From 7de021e7c1d12f6eeaef29e62509bd98b7fc3a5b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 27 Apr 2021 18:04:47 +0100 Subject: [PATCH 6/6] Revert "Update MCE" This reverts commit b85659640d74b534af9c391fffaf6cd62c501292. --- src/main/java/net/fabricmc/loom/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index 7ca9659..8189e91 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -102,7 +102,7 @@ public class Constants { * Constants for versions of dependencies. */ public static final class Versions { - public static final String MIXIN_COMPILE_EXTENSIONS = "0.4.2"; + 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";