Fix AW test

Signed-off-by: shedaniel <daniel@shedaniel.me>
This commit is contained in:
shedaniel
2021-07-13 21:12:46 +08:00
parent 3913da2b4f
commit 95bb7ebfb6
14 changed files with 40 additions and 15 deletions

View File

@@ -25,6 +25,7 @@
package net.fabricmc.loom.configuration;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
@@ -33,6 +34,7 @@ import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.UnknownTaskException;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.provider.Property;
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
import org.gradle.api.tasks.bundling.Jar;
import org.jetbrains.annotations.ApiStatus;
@@ -149,7 +151,8 @@ public class RemapConfiguration {
RemapSourcesJarTask remapSourcesJarTask = (RemapSourcesJarTask) project.getTasks().findByName(remapSourcesJarTaskName);
Preconditions.checkNotNull(remapSourcesJarTask, "Could not find " + remapSourcesJarTaskName + " in " + project.getName());
remapSourcesJarTask.setOutput(sourcesTask.getArchivePath());
sourcesTask.setClassifier(sourcesTask.getClassifier() == null ? "dev" : sourcesTask.getClassifier() + "-dev");
String sourcesTaskClassifer = getTaskClassifier(sourcesTask);
setTaskClassifier(sourcesTask, sourcesTaskClassifer == null ? "dev" : sourcesTaskClassifer + "-dev");
remapSourcesJarTask.setInput(sourcesTask.getArchivePath());
remapSourcesJarTask.dependsOn(sourcesTask);
@@ -173,4 +176,26 @@ public class RemapConfiguration {
// pass
}
}
private static String getTaskClassifier(AbstractArchiveTask sourcesTask) {
try {
Property<String> property = (Property<String>) AbstractArchiveTask.class.getDeclaredMethod("getArchiveClassifier").invoke(sourcesTask);
return property.get();
} catch (NoSuchMethodException e) {
return sourcesTask.getClassifier();
} catch (InvocationTargetException | IllegalAccessException e) {
throw new RuntimeException(e);
}
}
private static void setTaskClassifier(AbstractArchiveTask sourcesTask, String s) {
try {
Property<String> property = (Property<String>) AbstractArchiveTask.class.getDeclaredMethod("getArchiveClassifier").invoke(sourcesTask);
property.set(s);
} catch (NoSuchMethodException e) {
sourcesTask.setClassifier(s);
} catch (InvocationTargetException | IllegalAccessException e) {
throw new RuntimeException(e);
}
}
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
id 'maven-publish'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
}
dependencies {

View File

@@ -2,7 +2,7 @@ import java.util.Properties
plugins {
kotlin("jvm") version "1.4.31"
id("fabric-loom")
id("dev.architectury.loom")
}
java {

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
}
sourceCompatibility = JavaVersion.VERSION_1_8

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
id 'maven-publish'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
id 'maven-publish'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
id 'maven-publish'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
id 'maven-publish'
}

View File

@@ -1,11 +1,11 @@
plugins {
id "java"
id "java-library"
id 'fabric-loom' apply false
id 'dev.architectury.loom' apply false
}
allprojects {
apply plugin: "fabric-loom"
apply plugin: "dev.architectury.loom"
version = "1.0.0"

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
id 'maven-publish'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
}
loom {

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
id 'maven-publish'
}

View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'dev.architectury.loom'
}
dependencies {