hibiscus-client/fabric-loom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev/0.7' into future/dev

Browse source 
# Conflicts:
#	src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
This commit is contained in:
modmuss50 2021-05-04 18:29:00 +01:00
commit be0444d261
14 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -221,7 +221,7 @@ publishing {
task writeActionsTestMatrix() { task writeActionsTestMatrix() {
doLast { doLast {
def testMatrix = [] 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("Test.groovy")) {
if (it.name.endsWith("ReproducibleBuildTest.groovy")) { if (it.name.endsWith("ReproducibleBuildTest.groovy")) {
// This test gets a special case to run across all os's // This test gets a special case to run across all os's
@ -229,7 +229,7 @@ task writeActionsTestMatrix() {
} }
def className = it.name.replace(".groovy", "") def className = it.name.replace(".groovy", "")
testMatrix.add("net.fabricmc.loom.test.intergration.${className}") testMatrix.add("net.fabricmc.loom.test.integration.${className}")
} }
} }

1
src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
View file

@ -97,6 +97,7 @@ public final class CompileConfiguration {
extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project); extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project);
extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, 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) { public static void configureCompile(Project p) {

2
src/main/java/net/fabricmc/loom/util/Constants.java
View file

@ -89,7 +89,7 @@ public class Constants {
* Constants for versions of dependencies. * Constants for versions of dependencies.
*/ */
public static final class Versions { 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 DEV_LAUNCH_INJECTOR = "0.2.1+build.8";
public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0";
public static final String JETBRAINS_ANNOTATIONS = "19.0.0"; public static final String JETBRAINS_ANNOTATIONS = "19.0.0";

2
src/test/groovy/net/fabricmc/loom/test/intergration/AccessWidenerTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/AccessWidenerTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * 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.ArchiveAssertionsTrait
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait

2
src/test/groovy/net/fabricmc/loom/test/intergration/DecompileTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/DecompileTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait
import spock.lang.Specification import spock.lang.Specification

2
src/test/groovy/net/fabricmc/loom/test/intergration/KotlinTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait
import spock.lang.IgnoreIf import spock.lang.IgnoreIf

2
src/test/groovy/net/fabricmc/loom/test/intergration/LegacyProjectTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/LegacyProjectTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait
import spock.lang.Specification import spock.lang.Specification

2
src/test/groovy/net/fabricmc/loom/test/intergration/MavenProjectTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/MavenProjectTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * 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.ArchiveAssertionsTrait
import net.fabricmc.loom.test.util.MockMavenServerTrait import net.fabricmc.loom.test.util.MockMavenServerTrait

2
src/test/groovy/net/fabricmc/loom/test/intergration/MojangMappingsProjectTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/MojangMappingsProjectTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait
import spock.lang.Specification import spock.lang.Specification

2
src/test/groovy/net/fabricmc/loom/test/intergration/MultiProjectTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/MultiProjectTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * 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.ArchiveAssertionsTrait
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait

2
src/test/groovy/net/fabricmc/loom/test/intergration/ReproducibleBuildTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/ReproducibleBuildTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import com.google.common.hash.HashCode import com.google.common.hash.HashCode
import com.google.common.hash.Hashing import com.google.common.hash.Hashing

2
src/test/groovy/net/fabricmc/loom/test/intergration/RunConfigTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/RunConfigTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait
import spock.lang.Specification import spock.lang.Specification

2
src/test/groovy/net/fabricmc/loom/test/intergration/SimpleProjectTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/SimpleProjectTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait
import spock.lang.Specification import spock.lang.Specification

2
src/test/groovy/net/fabricmc/loom/test/intergration/UnpickTest.groovy → src/test/groovy/net/fabricmc/loom/test/integration/UnpickTest.groovy
View file

@ -22,7 +22,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
package net.fabricmc.loom.test.intergration package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait import net.fabricmc.loom.test.util.ProjectTestTrait
import org.zeroturnaround.zip.ZipUtil import org.zeroturnaround.zip.ZipUtil