Skip to content

Commit

Permalink
Publish platform variants
Browse files Browse the repository at this point in the history
  • Loading branch information
lukebemish committed Jun 1, 2024
1 parent 89daf4a commit 844b72f
Showing 1 changed file with 26 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,13 @@ abstract class GenerateModuleMetadata extends DefaultTask implements HasMinecraf
clientDepEntries.add(depOf(objcBridge))
}

def clientPlatformDepEntries = new ArrayList<>(clientDepEntries)
clientPlatformDepEntries.addAll(clientNatives.values().collectMany { it }.collect { depOf(it) })

variants.add([
name : 'clientCompileDependencies',
attributes : [
'org.gradle.category' : 'library',
'org.gradle.usage' : 'java-api',
'org.gradle.jvm.version' : javaVersion,
'net.neoforged.distribution': 'client'
Expand All @@ -96,15 +100,26 @@ abstract class GenerateModuleMetadata extends DefaultTask implements HasMinecraf
variants.add([
name : 'clientRuntimeDependencies',
attributes : [
'org.gradle.category' : 'library',
'org.gradle.usage' : 'java-runtime',
'org.gradle.jvm.version' : javaVersion,
'net.neoforged.distribution': 'client'
],
dependencies: clientDepEntriesForRuntime
])
variants.add([
name : 'clientPlatform',
attributes : [
'org.gradle.category' : 'platform',
'org.gradle.jvm.version' : javaVersion,
'net.neoforged.distribution': 'client'
],
dependencies: clientPlatformDepEntries
])
variants.add([
name : 'serverCompileDependencies',
attributes : [
'org.gradle.category' : 'library',
'org.gradle.usage' : 'java-api',
'org.gradle.jvm.version' : javaVersion,
'net.neoforged.distribution': 'server'
Expand All @@ -114,18 +129,29 @@ abstract class GenerateModuleMetadata extends DefaultTask implements HasMinecraf
variants.add([
name : 'serverRuntimeDependencies',
attributes : [
'org.gradle.category' : 'library',
'org.gradle.usage' : 'java-runtime',
'org.gradle.jvm.version' : javaVersion,
'net.neoforged.distribution': 'server'
],
dependencies: serverDepEntries
])
variants.add([
name : 'clientPlatform',
attributes : [
'org.gradle.category' : 'platform',
'org.gradle.jvm.version' : javaVersion,
'net.neoforged.distribution': 'client'
],
dependencies: serverDepEntries
])

platforms.each { os ->
List<String> nativeList = clientNatives.get(os) ?: []
variants.add([
name : 'client' + os.capitalize() + 'Natives',
attributes : [
'org.gradle.category' : 'library',
'org.gradle.usage' : 'java-runtime',
'org.gradle.jvm.version' : javaVersion,
'net.neoforged.distribution' : 'client',
Expand Down

0 comments on commit 844b72f

Please sign in to comment.