imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 05:27:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'FabricMC/dev/0.7' into dev/0.7-forge

Browse Source
This commit is contained in:
shedaniel
2021-04-13 16:35:57 +08:00
parent cb821ede0f 83eaa0e340
commit e7530d489d
13 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -297,7 +297,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
@@ -305,7 +305,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}")
}
}

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.
*/
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

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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait
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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait
import spock.lang.Specification

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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait
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.
*/
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

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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait
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.
*/
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

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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import com.google.common.hash.HashCode
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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait
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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait
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.
*/
package net.fabricmc.loom.test.intergration
package net.fabricmc.loom.test.integration
import net.fabricmc.loom.test.util.ProjectTestTrait
import org.zeroturnaround.zip.ZipUtil

2
src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
View File

@@ -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()