Skip to content

Commit

Permalink
Publishing extended Gradle Module Metadata for Tooling
Browse files Browse the repository at this point in the history 
Backport of neoforged#959
  • Loading branch information
@embeddedt
embeddedt committed Dec 15, 2024
1 parent cb36ae9 commit 1fccab5
Show file tree
Hide file tree
Showing 2 changed files with 189 additions and 28 deletions.
5 changes: 0 additions & 5 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ gradleutils.version {
}
}

changelog {
from '20.4'
disableAutomaticPublicationRegistration()
}

// Print version, generally useful to know - also appears on CI
System.out.println("NeoForge version ${gradleutils.version.toString()}")

Expand Down
212 changes: 189 additions & 23 deletions projects/neoforge/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ plugins {
id 'maven-publish'
}

rootProject.gradleutils.setupSigning(project: project, signAllPublications: true)
apply plugin: 'net.neoforged.gradleutils'
gradleutils.setupSigning(project: project, signAllPublications: true)

changelog {
from '20.4'
disableAutomaticPublicationRegistration()
}

dynamicProject {
runtime("${project.minecraft_version}-${project.neoform_version}",
Expand Down Expand Up @@ -193,8 +199,6 @@ tasks.withType(Javadoc.class).configureEach {
options.addStringOption('Xdoclint:all,-missing', '-public')
}

tasks.withType(GenerateModuleMetadata).configureEach { enabled = false }

configurations {
forValidation {
canBeConsumed = true
Expand All @@ -216,6 +220,187 @@ artifacts {
}
}

AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.components.findByName("java")
// Ensure the two default variants are not published, since they
// contain Minecraft classes
javaComponent.withVariantsFromConfiguration(configurations.apiElements) {
it.skip()
}
javaComponent.withVariantsFromConfiguration(configurations.runtimeElements) {
it.skip()
}
configurations {
modDevBundle {
canBeResolved = false
canBeConsumed = true
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, "data"))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
}
outgoing {
capability("net.neoforged:neoforge-moddev-bundle:${project.version}")
}
javaComponent.addVariantsFromConfiguration(it) {} // Publish it
}
modDevConfig {
canBeResolved = false
canBeConsumed = true
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, "data"))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
}
outgoing {
capability("net.neoforged:neoforge-moddev-config:${project.version}")
}
javaComponent.addVariantsFromConfiguration(it) {} // Publish it
}
installerJar {
canBeResolved = false
canBeConsumed = true
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY))
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EMBEDDED))
// The installer targets JDK 8
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
}
outgoing {
capability("net.neoforged:neoforge-installer:${project.version}")
}
// Publish it
javaComponent.addVariantsFromConfiguration(it) {}
}
universalJar {
canBeResolved = false
canBeConsumed = true
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY))
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, JavaVersion.current().majorVersion.toInteger())
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
}
// Publish it
javaComponent.addVariantsFromConfiguration(it) {}
}
changelog {
canBeResolved = false
canBeConsumed = true
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.DOCUMENTATION))
attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType, "changelog"))
}
javaComponent.addVariantsFromConfiguration(it) {}
}
modDevApiElements {
canBeResolved = false
canBeConsumed = true
afterEvaluate {
extendsFrom userdevCompileOnly, installerLibraries, moduleOnly
}
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_API))
}
outgoing {
capability("net.neoforged:neoforge-dependencies:${project.version}")
}
javaComponent.addVariantsFromConfiguration(it) {}
}
modDevRuntimeElements {
canBeResolved = false
canBeConsumed = true
afterEvaluate {
extendsFrom installerLibraries, moduleOnly
}
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME))
}
outgoing {
capability("net.neoforged:neoforge-dependencies:${project.version}")
}
javaComponent.addVariantsFromConfiguration(it) {}
}
modDevModulePath {
canBeResolved = false
canBeConsumed = true
afterEvaluate {
extendsFrom moduleOnly
}
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
}
outgoing {
capability("net.neoforged:neoforge-moddev-module-path:${project.version}")
}
javaComponent.addVariantsFromConfiguration(it) {}
}
modDevTestFixtures {
canBeResolved = false
canBeConsumed = true
attributes {
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.LIBRARY))
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling, Bundling.EXTERNAL))
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, Usage.JAVA_RUNTIME))
}
outgoing {
capability("net.neoforged:neoforge-moddev-test-fixtures:${project.version}")
}
javaComponent.addVariantsFromConfiguration(it) {}
}
}
dependencies {
modDevBundle("net.neoforged:neoform:${project.minecraft_version}-${project.neoform_version}") {
capabilities {
requireCapability 'net.neoforged:neoform'
}
endorseStrictVersions()
}
modDevApiElements("net.neoforged:neoform:${project.minecraft_version}-${project.neoform_version}") {
capabilities {
requireCapability 'net.neoforged:neoform-dependencies'
}
endorseStrictVersions()
}
modDevRuntimeElements("net.neoforged:neoform:${project.minecraft_version}-${project.neoform_version}") {
capabilities {
requireCapability 'net.neoforged:neoform-dependencies'
}
endorseStrictVersions()
}
modDevTestFixtures("net.neoforged.fancymodloader:junit-fml:${project.fancy_mod_loader_version}") {
endorseStrictVersions()
}
}
afterEvaluate {
artifacts {
modDevBundle(userdevJar) {
setClassifier("userdev") // Legacy
}
modDevConfig(createUserdevJson.output) {
builtBy(createUserdevJson)
setClassifier("moddev-config")
}
universalJar(signUniversalJar.output) {
builtBy(signUniversalJar)
setClassifier("universal")
}
installerJar(signInstallerJar.output) {
builtBy(signInstallerJar)
setClassifier("installer")
}
changelog(createChangelog.outputFile) {
builtBy(createChangelog)
setClassifier("changelog")
setExtension("txt")
}
}
}

minecraft {
modIdentifier 'minecraft'
}
Expand All @@ -228,25 +413,6 @@ publishing {

from components.java

artifacts = []

afterEvaluate {
artifact (signUniversalJar.output) {
classifier 'universal'
}
artifact (signInstallerJar.output) {
classifier 'installer'
}
artifact (userdevJar) {
classifier 'userdev'
}
artifact (sourcesJar) {
classifier 'sources'
}
}

changelog.publish(it)

versionMapping {
usage('java-api') {
fromResolutionOf('runtimeClasspath')
Expand Down Expand Up @@ -282,6 +448,6 @@ publishing {
}
}
repositories {
maven rootProject.gradleutils.getPublishingMaven()
maven gradleutils.getPublishingMaven()
}
}

0 comments on commit 1fccab5

Please sign in to comment.