clean up tcnative library packaging

This commit is contained in:
Jörg Prante 2024-02-17 00:13:42 +01:00
parent 1b906bf706
commit 09ba068497

View file

@ -5,7 +5,6 @@ task nettyTcNativeBoringSslStaticLinuxX8664(type: Jar) {
archiveBaseName.set('netty-tcnative-boringssl-static') archiveBaseName.set('netty-tcnative-boringssl-static')
archiveClassifier.set('linux-x86_64') archiveClassifier.set('linux-x86_64')
version rootProject.version version rootProject.version
//from (sourceSets.main.output) {
from (project.layout.projectDirectory.dir('src/main/resources')) { from (project.layout.projectDirectory.dir('src/main/resources')) {
include 'META-INF/native/libnetty_tcnative_linux_x86_64.so' include 'META-INF/native/libnetty_tcnative_linux_x86_64.so'
} }
@ -16,7 +15,6 @@ task nettyTcNativeBoringSslStaticLinuxAarch64(type: Jar) {
archiveBaseName.set('netty-tcnative-boringssl-static') archiveBaseName.set('netty-tcnative-boringssl-static')
archiveClassifier.set('linux-aarch_64') archiveClassifier.set('linux-aarch_64')
version rootProject.version version rootProject.version
//from (sourceSets.main.output) {
from (project.layout.projectDirectory.dir('src/main/resources')) { from (project.layout.projectDirectory.dir('src/main/resources')) {
include 'META-INF/native/libnetty_tcnative_linux_aarch_64.so' include 'META-INF/native/libnetty_tcnative_linux_aarch_64.so'
} }
@ -27,7 +25,6 @@ task nettyTcNativeBoringSslStaticOsxX8664(type: Jar) {
archiveBaseName.set('netty-tcnative-boringssl-static') archiveBaseName.set('netty-tcnative-boringssl-static')
archiveClassifier.set('osx-x86_64') archiveClassifier.set('osx-x86_64')
version rootProject.version version rootProject.version
//from (sourceSets.main.output) {
from (project.layout.projectDirectory.dir('src/main/resources')) { from (project.layout.projectDirectory.dir('src/main/resources')) {
include 'META-INF/native/libnetty_tcnative_osx_x86_64.jnilib' include 'META-INF/native/libnetty_tcnative_osx_x86_64.jnilib'
} }
@ -38,7 +35,6 @@ task nettyTcNativeBoringSslStaticOsxAarch64(type: Jar) {
archiveBaseName.set('netty-tcnative-boringssl-static') archiveBaseName.set('netty-tcnative-boringssl-static')
archiveClassifier.set('osx-aarch_64') archiveClassifier.set('osx-aarch_64')
version rootProject.version version rootProject.version
//from (sourceSets.main.output) {
from (project.layout.projectDirectory.dir('src/main/resources')) { from (project.layout.projectDirectory.dir('src/main/resources')) {
include 'META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib' include 'META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib'
} }
@ -49,9 +45,8 @@ task nettyTcNativeBoringSslStaticWindowsX8664(type: Jar) {
archiveBaseName.set('netty-tcnative-boringssl-static') archiveBaseName.set('netty-tcnative-boringssl-static')
archiveClassifier.set('windows-x86_64') archiveClassifier.set('windows-x86_64')
version rootProject.version version rootProject.version
//from (sourceSets.main.output) {
from (project.layout.projectDirectory.dir('src/main/resources')) { from (project.layout.projectDirectory.dir('src/main/resources')) {
include 'META-INF/native/libnetty_tcnative_windows_x86_64.dll' include 'META-INF/native/netty_tcnative_windows_x86_64.dll'
} }
} }
assemble.dependsOn(nettyTcNativeBoringSslStaticWindowsX8664) assemble.dependsOn(nettyTcNativeBoringSslStaticWindowsX8664)
@ -59,28 +54,23 @@ assemble.dependsOn(nettyTcNativeBoringSslStaticWindowsX8664)
configurations { configurations {
'linux-x86_64' { 'linux-x86_64' {
canBeConsumed = true canBeConsumed = true
canBeResolved = false canBeResolved = true
//extendsFrom runtimeOnly
} }
'linux-aarch64' { 'linux-aarch64' {
canBeConsumed = true canBeConsumed = true
canBeResolved = false canBeResolved = true
//extendsFrom runtimeOnly
} }
'osx-x86_64' { 'osx-x86_64' {
canBeConsumed = true canBeConsumed = true
canBeResolved = false canBeResolved = true
//extendsFrom runtimeOnly
} }
'osx-aarch64' { 'osx-aarch64' {
canBeConsumed = true canBeConsumed = true
canBeResolved = false canBeResolved = true
//extendsFrom runtimeOnly
} }
'windows-x86_64' { 'windows-x86_64' {
canBeConsumed = true canBeConsumed = true
canBeResolved = false canBeResolved = true
//extendsFrom runtimeOnly
} }
} }
@ -99,43 +89,6 @@ publishing {
artifactId project.name artifactId project.name
version rootProject.version version rootProject.version
artifact nettyTcNativeBoringSslStaticLinuxX8664 artifact nettyTcNativeBoringSslStaticLinuxX8664
pom {
artifactId = project.name
name = project.name
version = project.version
description = rootProject.ext.description
url = rootProject.ext.url
inceptionYear = rootProject.ext.inceptionYear
packaging = 'jar'
organization {
name = rootProject.ext.organizationName
url = rootProject.ext.organizationUrl
}
developers {
developer {
id = 'jprante'
name = 'Jörg Prante'
email = 'joergprante@gmail.com'
url = 'https://xbib.org/joerg'
}
}
scm {
url = rootProject.ext.scmUrl
connection = rootProject.ext.scmConnection
developerConnection = rootProject.ext.scmDeveloperConnection
}
issueManagement {
system = rootProject.ext.issueManagementSystem
url = rootProject.ext.issueManagementUrl
}
licenses {
license {
name = rootProject.ext.licenseName
url = rootProject.ext.licenseUrl
distribution = 'repo'
}
}
}
} }
publishNettyTcNativeBoringSslStaticLinuxAarch64(MavenPublication) { publishNettyTcNativeBoringSslStaticLinuxAarch64(MavenPublication) {
groupId rootProject.group groupId rootProject.group