From 09ba06849793952364aa7495c3dd27bba6bbec66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Sat, 17 Feb 2024 00:13:42 +0100 Subject: [PATCH] clean up tcnative library packaging --- .../build.gradle | 59 ++----------------- 1 file changed, 6 insertions(+), 53 deletions(-) diff --git a/netty-tcnative-boringssl-static-native/build.gradle b/netty-tcnative-boringssl-static-native/build.gradle index f4d583a..671ff8b 100644 --- a/netty-tcnative-boringssl-static-native/build.gradle +++ b/netty-tcnative-boringssl-static-native/build.gradle @@ -5,7 +5,6 @@ task nettyTcNativeBoringSslStaticLinuxX8664(type: Jar) { archiveBaseName.set('netty-tcnative-boringssl-static') archiveClassifier.set('linux-x86_64') version rootProject.version - //from (sourceSets.main.output) { from (project.layout.projectDirectory.dir('src/main/resources')) { include 'META-INF/native/libnetty_tcnative_linux_x86_64.so' } @@ -16,7 +15,6 @@ task nettyTcNativeBoringSslStaticLinuxAarch64(type: Jar) { archiveBaseName.set('netty-tcnative-boringssl-static') archiveClassifier.set('linux-aarch_64') version rootProject.version - //from (sourceSets.main.output) { from (project.layout.projectDirectory.dir('src/main/resources')) { include 'META-INF/native/libnetty_tcnative_linux_aarch_64.so' } @@ -27,7 +25,6 @@ task nettyTcNativeBoringSslStaticOsxX8664(type: Jar) { archiveBaseName.set('netty-tcnative-boringssl-static') archiveClassifier.set('osx-x86_64') version rootProject.version - //from (sourceSets.main.output) { from (project.layout.projectDirectory.dir('src/main/resources')) { include 'META-INF/native/libnetty_tcnative_osx_x86_64.jnilib' } @@ -38,7 +35,6 @@ task nettyTcNativeBoringSslStaticOsxAarch64(type: Jar) { archiveBaseName.set('netty-tcnative-boringssl-static') archiveClassifier.set('osx-aarch_64') version rootProject.version - //from (sourceSets.main.output) { from (project.layout.projectDirectory.dir('src/main/resources')) { include 'META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib' } @@ -49,9 +45,8 @@ task nettyTcNativeBoringSslStaticWindowsX8664(type: Jar) { archiveBaseName.set('netty-tcnative-boringssl-static') archiveClassifier.set('windows-x86_64') version rootProject.version - //from (sourceSets.main.output) { 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) @@ -59,28 +54,23 @@ assemble.dependsOn(nettyTcNativeBoringSslStaticWindowsX8664) configurations { 'linux-x86_64' { canBeConsumed = true - canBeResolved = false - //extendsFrom runtimeOnly + canBeResolved = true } 'linux-aarch64' { canBeConsumed = true - canBeResolved = false - //extendsFrom runtimeOnly + canBeResolved = true } 'osx-x86_64' { canBeConsumed = true - canBeResolved = false - //extendsFrom runtimeOnly + canBeResolved = true } 'osx-aarch64' { canBeConsumed = true - canBeResolved = false - //extendsFrom runtimeOnly + canBeResolved = true } 'windows-x86_64' { canBeConsumed = true - canBeResolved = false - //extendsFrom runtimeOnly + canBeResolved = true } } @@ -99,43 +89,6 @@ publishing { artifactId project.name version rootProject.version 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) { groupId rootProject.group