Merge branch 'dev/0.7' into future/dev
# Conflicts: # src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovydev/0.11
commit
be0444d261
|
@ -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}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
|
@ -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";
|
||||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
Loading…
Reference in New Issue