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

Fix local ivy layout not respecting classifiers. Fixes #407

Browse source
This commit is contained in:
modmuss50 2021-05-28 11:31:19 +01:00
parent 3318a15cc5
commit 210938d749
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -267,3 +267,7 @@ task writeActionsTestMatrix() {
output.text = json output.text = json
} }
} }
tasks.named('wrapper') {
distributionType = Wrapper.DistributionType.ALL
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java
View file

@ -81,7 +81,7 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> {
repositories.ivy(repo -> { repositories.ivy(repo -> {
repo.setUrl(cache.getUserCache()); repo.setUrl(cache.getUserCache());
repo.patternLayout(layout -> { repo.patternLayout(layout -> {
layout.artifact("[revision]/[artifact]-[revision](.[ext])"); layout.artifact("[revision]/[artifact]-[revision](-[classifier])(.[ext])");
}); });
repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact); repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact);
}); });
@ -90,7 +90,7 @@ public class LoomRepositoryPlugin implements Plugin<PluginAware> {
repositories.ivy(repo -> { repositories.ivy(repo -> {
repo.setUrl(cache.getRootPersistentCache()); repo.setUrl(cache.getRootPersistentCache());
repo.patternLayout(layout -> { repo.patternLayout(layout -> {
layout.artifact("[revision]/[artifact]-[revision](.[ext])"); layout.artifact("[revision]/[artifact]-[revision](-[classifier])(.[ext])");
}); });
repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact); repo.metadataSources(IvyArtifactRepository.MetadataSources::artifact);
}); });

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

@ -29,7 +29,7 @@ import org.gradle.testkit.runner.GradleRunner
trait ProjectTestTrait { trait ProjectTestTrait {
final static String DEFAULT_GRADLE = "7.0.1" final static String DEFAULT_GRADLE = "7.0.1"
final static String PRE_RELEASE_GRADLE = "7.1-20210520220048+0000" final static String PRE_RELEASE_GRADLE = "7.2-20210527220045+0000"
static File gradleHome = File.createTempDir() static File gradleHome = File.createTempDir()
File testProjectDir = File.createTempDir() File testProjectDir = File.createTempDir()