aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle70
-rw-r--r--buildSrc/src/main/groovy/net/minecraftforge/artifactural/buildscript/JarTransformationTask.groovy15
2 files changed, 62 insertions, 23 deletions
diff --git a/build.gradle b/build.gradle
index 67e7395..9d1bf68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,15 @@
import net.minecraftforge.artifactural.buildscript.JarTransformationTask
+import org.objectweb.asm.Label
import org.objectweb.asm.Opcodes
import org.objectweb.asm.tree.InsnNode
import org.objectweb.asm.tree.MethodInsnNode
-import org.objectweb.asm.Label
plugins {
- id 'java-library'
- id 'maven-publish'
- id 'eclipse'
- id 'org.cadixdev.licenser' version '0.6.1'
- id 'net.minecraftforge.gradleutils' version '2.+'
+ id 'java-library'
+ id 'maven-publish'
+ id 'eclipse'
+ id 'org.cadixdev.licenser' version '0.6.1'
+ id 'net.minecraftforge.gradleutils' version '2.+'
}
group = 'net.minecraftforge'
@@ -62,7 +62,7 @@ java {
withSourcesJar()
}
-tasks.register('transformJar', JarTransformationTask).configure {
+tasks.register('transformJar', JarTransformationTask) {
addTransformer('net/minecraftforge/artifactural/gradle/GradleRepositoryAdapter') {
it.methods.find {
it.name == '<init>' && it.desc == '(Lnet/minecraftforge/artifactural/api/repository/Repository;Lorg/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository;)V'
@@ -77,8 +77,9 @@ tasks.register('transformJar', JarTransformationTask).configure {
}
addTransformer('net/minecraftforge/artifactural/gradle/GradleRepositoryAdapter$1$1') { clazz ->
+ // Gradle [6.1,7.6)
{
- final method = clazz.visitMethod(Opcodes.ACC_PUBLIC, 'resolveArtifact', '(Lorg/gradle/internal/component/model/ComponentArtifactMetadata;Lorg/gradle/internal/component/model/ModuleSources;Lorg/gradle/internal/resolve/result/BuildableArtifactResolveResult;)V', null, new String[] {})
+ final method = clazz.visitMethod(Opcodes.ACC_PUBLIC, 'resolveArtifact', '(Lorg/gradle/internal/component/model/ComponentArtifactMetadata;Lorg/gradle/internal/component/model/ModuleSources;Lorg/gradle/internal/resolve/result/BuildableArtifactResolveResult;)V', null, new String[]{})
final l0 = new Label()
method.visitLabel(l0)
@@ -94,14 +95,15 @@ tasks.register('transformJar', JarTransformationTask).configure {
final l2 = new Label()
method.visitLabel(l2)
method.visitLocalVariable('this', 'Lnet/minecraftforge/artifactural/gradle/GradleRepositoryAdapter$1$1;', null, l0, l2, 0)
- method.visitLocalVariable('componentArtifactMetadata', 'Lorg/gradle/internal/component/model/ComponentArtifactMetadata;', null, l0, l2, 1)
+ method.visitLocalVariable('artifact', 'Lorg/gradle/internal/component/model/ComponentArtifactMetadata;', null, l0, l2, 1)
method.visitLocalVariable('moduleSources', 'Lorg/gradle/internal/component/model/ModuleSources;', null, l0, l2, 2)
- method.visitLocalVariable('buildableArtifactFileResolveResult', 'Lorg/gradle/internal/resolve/result/BuildableArtifactResolveResult;', null, l0, l2, 3)
+ method.visitLocalVariable('result', 'Lorg/gradle/internal/resolve/result/BuildableArtifactResolveResult;', null, l0, l2, 3)
method.visitEnd()
}
+ // Gradle [6.0,7.6)
{
- final method = clazz.visitMethod(Opcodes.ACC_PUBLIC, 'resolveArtifacts', '(Lorg/gradle/internal/component/model/ComponentArtifactMetadata;Lorg/gradle/internal/component/model/ConfigurationMetadata;Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;)V', null, new String[] {})
+ final method = clazz.visitMethod(Opcodes.ACC_PUBLIC, 'resolveArtifacts', '(Lorg/gradle/internal/component/model/ComponentResolveMetadata;Lorg/gradle/internal/component/model/ConfigurationMetadata;Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;)V', null, new String[]{})
final l0 = new Label()
method.visitLabel(l0)
@@ -110,28 +112,53 @@ tasks.register('transformJar', JarTransformationTask).configure {
method.visitVarInsn(Opcodes.ALOAD, 1)
method.visitVarInsn(Opcodes.ALOAD, 2)
method.visitVarInsn(Opcodes.ALOAD, 3)
- method.visitMethodInsn(Opcodes.INVOKEINTERFACE, 'org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess', 'resolveArtifacts', '(Lorg/gradle/internal/component/model/ComponentArtifactMetadata;Lorg/gradle/internal/component/model/ModuleSources;Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;)V', true)
+ method.visitMethodInsn(Opcodes.INVOKEINTERFACE, 'org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess', 'resolveArtifacts', '(Lorg/gradle/internal/component/model/ComponentResolveMetadata;Lorg/gradle/internal/component/model/ConfigurationMetadata;Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;)V', true)
final l1 = new Label()
method.visitLabel(l1)
method.visitInsn(Opcodes.RETURN)
final l2 = new Label()
method.visitLabel(l2)
method.visitLocalVariable('this', 'Lnet/minecraftforge/artifactural/gradle/GradleRepositoryAdapter$1$1;', null, l0, l2, 0)
- method.visitLocalVariable('componentArtifactMetadata', 'Lorg/gradle/internal/component/model/ComponentArtifactMetadata;', null, l0, l2, 1)
- method.visitLocalVariable('metadata', 'Lorg/gradle/internal/component/model/ConfigurationMetadata;', null, l0, l2, 2)
- method.visitLocalVariable('buildableArtifactFileResolveResult', 'Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;', null, l0, l2, 3)
+ method.visitLocalVariable('component', 'Lorg/gradle/internal/component/model/ComponentResolveMetadata;', null, l0, l2, 1)
+ method.visitLocalVariable('variant', 'Lorg/gradle/internal/component/model/ConfigurationMetadata;', null, l0, l2, 2)
+ method.visitLocalVariable('result', 'Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;', null, l0, l2, 3)
+ method.visitEnd()
+ }
+
+ // Gradle [3.1,6.0) U [7.5,7.6)
+ {
+ final method = clazz.visitMethod(Opcodes.ACC_PUBLIC, 'resolveArtifacts', '(Lorg/gradle/internal/component/model/ComponentResolveMetadata;Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;)V', null, new String[]{})
+ final l0 = new Label()
+ method.visitLabel(l0)
+
+ method.visitVarInsn(Opcodes.ALOAD, 0)
+ method.visitFieldInsn(Opcodes.GETFIELD, 'net/minecraftforge/artifactural/gradle/GradleRepositoryAdapter$1$1', 'val$delegate', 'Lorg/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess;')
+ method.visitVarInsn(Opcodes.ALOAD, 1)
+ method.visitVarInsn(Opcodes.ALOAD, 2)
+ method.visitMethodInsn(Opcodes.INVOKEINTERFACE, 'org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess', 'resolveArtifacts', '(Lorg/gradle/internal/component/model/ComponentResolveMetadata;Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;)V', true)
+ final l1 = new Label()
+ method.visitLabel(l1)
+ method.visitInsn(Opcodes.RETURN)
+ final l2 = new Label()
+ method.visitLabel(l2)
+ method.visitLocalVariable('this', 'Lnet/minecraftforge/artifactural/gradle/GradleRepositoryAdapter$1$1;', null, l0, l2, 0)
+ method.visitLocalVariable('component', 'Lorg/gradle/internal/component/model/ComponentResolveMetadata;', null, l0, l2, 1)
+ method.visitLocalVariable('result', 'Lorg/gradle/internal/resolve/result/BuildableComponentArtifactsResolveResult;', null, l0, l2, 3)
method.visitEnd()
}
}
- file.set(tasks.jar.archiveFile)
+ inputFile = tasks.named('jar').flatMap { it.archiveFile }
+ outputFile = project.layout.buildDirectory.dir('libs').flatMap { dir ->
+ tasks.named('jar').flatMap { it.archiveFileName }.map { String name -> dir.file(name.substring(0, name.length() - 4) + '-transformed.jar') }
+ }
}
jar {
from sourceSets.api.output
from sourceSets.shared.output
from sourceSets.gradlecomp.output
- finalizedBy('transformJar')
+ finalizedBy 'transformJar'
}
sourcesJar {
@@ -144,9 +171,16 @@ license {
header = file("$rootDir/LICENSE-header.txt")
}
+artifacts {
+ archives tasks.named('transformJar').flatMap { it.outputFile }
+}
+
publishing {
publications.create("mavenJava", MavenPublication) {
- from components.java
+ artifact sourcesJar
+ artifact(tasks.named('transformJar').flatMap { it.outputFile }) {
+ classifier = null
+ }
pom {
groupId = project.group
version = project.version
diff --git a/buildSrc/src/main/groovy/net/minecraftforge/artifactural/buildscript/JarTransformationTask.groovy b/buildSrc/src/main/groovy/net/minecraftforge/artifactural/buildscript/JarTransformationTask.groovy
index 8dce1a4..137ea71 100644
--- a/buildSrc/src/main/groovy/net/minecraftforge/artifactural/buildscript/JarTransformationTask.groovy
+++ b/buildSrc/src/main/groovy/net/minecraftforge/artifactural/buildscript/JarTransformationTask.groovy
@@ -25,8 +25,9 @@ import groovy.transform.stc.SimpleType
import org.gradle.api.DefaultTask
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.MapProperty
-import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputFile
import org.gradle.api.tasks.TaskAction
import org.objectweb.asm.ClassReader
import org.objectweb.asm.ClassWriter
@@ -40,12 +41,16 @@ import java.util.zip.ZipOutputStream
@CompileStatic
abstract class JarTransformationTask extends DefaultTask {
@InputFile
- abstract RegularFileProperty getFile()
- @Input
+ abstract RegularFileProperty getInputFile()
+ @OutputFile
+ abstract RegularFileProperty getOutputFile()
+ @Internal
abstract MapProperty<String, ClassTransformer> getTransformers()
JarTransformationTask() {
transformers.convention([:])
+ // Class transformers can change and are not serializable, so we always have to run this
+ outputs.upToDateWhen { false }
}
void addTransformer(String className, @ClosureParams(value = SimpleType, options = 'org.objectweb.asm.tree.ClassNode') Closure transformer) {
@@ -56,7 +61,7 @@ abstract class JarTransformationTask extends DefaultTask {
void run() {
final bos = new ByteArrayOutputStream()
final zipOut = new ZipOutputStream(bos)
- try (final zipIn = new ZipInputStream(file.get().asFile.newInputStream())) {
+ try (final zipIn = new ZipInputStream(inputFile.get().asFile.newInputStream())) {
ZipEntry entry
while ((entry = zipIn.nextEntry) !== null) {
if (entry.name.endsWith('.class')) {
@@ -83,7 +88,7 @@ abstract class JarTransformationTask extends DefaultTask {
}
zipOut.close()
- Files.write(file.asFile.get().toPath(), bos.toByteArray())
+ Files.write(outputFile.asFile.get().toPath(), bos.toByteArray())
}
private static ZipEntry copy(ZipEntry entry) {
generated by cgit (git 2.46.0) at 2024-11-23 09:55:14 +0000