Skip to content

Add Gradle 8.13 support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2025
Merged

Add Gradle 8.13 support #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,23 @@ tasks.register('transformJar', JarTransformationTask) {
}

addTransformer('net/minecraftforge/artifactural/gradle/GradleRepositoryAdapter$1$1') { clazz ->
// Gradle [8.13) - listModuleVersions add delegate call
{
final mtd = 'listModuleVersions'
final desc = '(Lorg/gradle/api/artifacts/component/ModuleComponentSelector;Lorg/gradle/internal/component/model/ComponentOverrideMetadata;Lorg/gradle/internal/resolve/result/BuildableModuleVersionListingResolveResult;)V'

clazz.methods.find { it.name == mtd && it.desc == desc }?.tap {
it.instructions.clear()
it.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0))
it.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, 'net/minecraftforge/artifactural/gradle/GradleRepositoryAdapter$1$1', 'val$delegate', 'Lorg/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess;'))
it.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1))
it.instructions.add(new VarInsnNode(Opcodes.ALOAD, 2))
it.instructions.add(new VarInsnNode(Opcodes.ALOAD, 3))
it.instructions.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, 'org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess', 'listModuleVersions', '(Lorg/gradle/api/artifacts/component/ModuleComponentSelector;Lorg/gradle/internal/component/model/ComponentOverrideMetadata;Lorg/gradle/internal/resolve/result/BuildableModuleVersionListingResolveResult;)V'))
it.instructions.add(new InsnNode(Opcodes.RETURN))
}
}

// Gradle [8.9) - resolveArtifactsWithType changed parameter types
{
final mtd = 'resolveArtifactsWithType'
Expand Down
9 changes: 9 additions & 0 deletions src/gradlecomp/java/net/minecraftforge/artifactural/gradle/GradleRepositoryAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.gradle.api.artifacts.ComponentMetadataSupplierDetails;
import org.gradle.api.artifacts.component.ComponentArtifactIdentifier;
import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
import org.gradle.api.artifacts.component.ModuleComponentSelector;
import org.gradle.api.artifacts.dsl.RepositoryHandler;
import org.gradle.api.internal.artifacts.BaseRepositoryFactory;
import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ComponentResolvers;
Expand Down Expand Up @@ -256,6 +257,14 @@ public void listModuleVersions(ModuleDependencyMetadata dependency, BuildableMod
delegate.listModuleVersions(dependency, result);
}

// DO NOT TOUCH
// Gradle 8.13 changed the first argument from ModuleDependencyMetadata to ModuleComponentSelector and added a new argument ComponentOverrideMetadata
// https://github.com/gradle/gradle/commit/7f120d813df21b0d24f403180629f51ba0f8ee4c
@SuppressWarnings("unused")
public void listModuleVersions(ModuleComponentSelector selector, ComponentOverrideMetadata overrideMetadata, BuildableModuleVersionListingResolveResult result) {
//ASM in build.gradle adds the delegate call
}

@Override
public void resolveArtifactsWithType(ComponentResolveMetadata component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
delegate.resolveArtifactsWithType(component, artifactType, result);
Expand Down