remove extra repo and disable unpick

ix0rai · Apr 10, 2024 · 9410e4d · 9410e4d · github-actions · Apr 10, 2024
1 parent 90197a1
commit 9410e4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -65,11 +65,6 @@ repositories {
 		name "Quilt Snapshot Repository"
 		url "https://maven.quiltmc.org/repository/snapshot"
 	}
-	// remove when ASM fix is released
-	maven {
-		name "OW2 Snapshots"
-		url "https://repository.ow2.org/nexus/content/repositories/snapshots/"
-	}
 	mavenLocal()
 }
 
@@ -175,7 +170,7 @@ task unpickHashedJar(type: UnpickJarTask) {
 	unpickDefinition.set remapUnpickDefinitions.output.get()
 	unpickConstantsJar.set constantsJar.archiveFile
 
-	dependsOn MapPerVersionMappingsJarTask.TASK_NAME, "constantsJar", remapUnpickDefinitions
+	dependsOn MapPerVersionMappingsJarTask.TASK_NAME/*, "constantsJar", remapUnpickDefinitions*/
 }
 
 task mappingsUnpicked(type: EnigmaMappingsTask, dependsOn: unpickHashedJar) {
@@ -188,7 +183,7 @@ task mappings(type: EnigmaMappingsTask, dependsOn: "mapPerVersionMappingsJar") {
 
 // Only build jars for package infos if we need to actually expose stuff like annotation in the future.
 
-build.dependsOn constantsJar, generatePackageInfoMappings
+build.dependsOn /*constantsJar,*/ generatePackageInfoMappings
 
 task v2UnmergedMappingsJar(type: MappingsV2JarTask, dependsOn: [insertAutoGeneratedMappings, combineUnpickDefinitions]) {
 	archiveFileName = "${Constants.MAPPINGS_NAME}-${Constants.MAPPINGS_VERSION}-v2.jar"

diff --git a/buildSrc/src/main/java/quilt/internal/tasks/jarmapping/MapNamedJarTask.java b/buildSrc/src/main/java/quilt/internal/tasks/jarmapping/MapNamedJarTask.java
@@ -14,11 +14,12 @@ public MapNamedJarTask() {
 
         getInputs().files(getTaskByName(DownloadMinecraftLibrariesTask.TASK_NAME).getOutputs().getFiles().getFiles());
 
-        inputJar.convention(() -> fileConstants.unpickedJar);
+        //inputJar.convention(() -> fileConstants.unpickedJar);
+        inputJar.convention(() -> fileConstants.perVersionMappingsJar); // remove when reenabling unpick
         mappingsFile.convention(() -> this.<AddProposedMappingsTask>getTaskByName("insertAutoGeneratedMappings").getOutputMappings());
         outputJar.convention(() -> fileConstants.namedJar);
 
-        this.dependsOn("insertAutoGeneratedMappings", "unpickHashedJar");
+        this.dependsOn("insertAutoGeneratedMappings"/*, "unpickHashedJar"*/);
     }
 
     public Map<String, String> getAdditionalMappings() {