diff options
author | modmuss50 <modmuss50@gmail.com> | 2021-11-12 10:46:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-12 10:46:23 +0000 |
commit | 35afda4398c61d2c816e02a827231308e3b58bae (patch) | |
tree | 995930d5e1499516b7eb0981187b28ceda4071bb /src/test/groovy | |
parent | 2994c2d4883b4740ed0e86a82c00843b65708baa (diff) | |
download | architectury-loom-35afda4398c61d2c816e02a827231308e3b58bae.tar.gz architectury-loom-35afda4398c61d2c816e02a827231308e3b58bae.tar.bz2 architectury-loom-35afda4398c61d2c816e02a827231308e3b58bae.zip |
Fix `namedElements` not extending from api (#533)
* Fix `namedElements` not extending from api
Fix artifact not waiting for remapAllJars with shared caches
* Use apiElements
* Add a better test for this.
* Also add remapped api mods to namedElements
Diffstat (limited to 'src/test/groovy')
-rw-r--r-- | src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy | 2 | ||||
-rw-r--r-- | src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy index 643cee8d..8156fce6 100644 --- a/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/LoomTestConstants.groovy @@ -28,7 +28,7 @@ import org.gradle.util.GradleVersion class LoomTestConstants { public final static String DEFAULT_GRADLE = GradleVersion.current().getVersion() - public final static String PRE_RELEASE_GRADLE = "7.4-20211108233000+0000" + public final static String PRE_RELEASE_GRADLE = "7.4-20211110232442+0000" public final static String[] STANDARD_TEST_VERSIONS = [DEFAULT_GRADLE, PRE_RELEASE_GRADLE] } diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy index 893817ec..49db69b9 100644 --- a/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy @@ -43,14 +43,14 @@ class FabricAPITest extends Specification implements GradleProjectTestTrait { def "build and run (gradle #version)"() { setup: def gradle = gradleProject( - repo: "https://github.com/FabricMC/fabric.git", - commit: "46582230fb580d4c1f71e4b0737df27417ec9cb1", + repo: "https://github.com/modmuss50/fabric.git", + commit: "e954edb6069e36139fd70428cfe4cddb5826c498", version: version, - patch: "fabric_api" +// patch: "fabric_api" ) // Set the version to something constant - gradle.buildGradle.text = gradle.buildGradle.text.replace('Globals.baseVersion + "+" + (ENV.GITHUB_RUN_NUMBER ? "" : "local-") + getBranch()', "\"$API_VERSION\"") + gradle.buildGradle.text = gradle.buildGradle.text.replace('project.version + "+" + (ENV.GITHUB_RUN_NUMBER ? "" : "local-") + getBranch()', "\"$API_VERSION\"") def server = ServerRunner.create(gradle.projectDir, "1.17.1") .withMod(gradle.getOutputFile("fabric-api-${API_VERSION}.jar")) |