From afa602212f1692440ab260f59f46ff87a4499000 Mon Sep 17 00:00:00 2001 From: Nicolas Pomepuy Date: Thu, 17 Jul 2025 08:10:40 +0200 Subject: [PATCH] Update the maven plugin --- build.gradle | 2 +- buildsystem/maven/deploy-to-mavencentral.sh | 28 ++++++++++++++++----- gradle.properties | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 21bf912b0..f49f7840e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath "com.android.tools.build:gradle:$android_plugin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.2' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.34.0' } } diff --git a/buildsystem/maven/deploy-to-mavencentral.sh b/buildsystem/maven/deploy-to-mavencentral.sh index 991759abe..a126f100a 100755 --- a/buildsystem/maven/deploy-to-mavencentral.sh +++ b/buildsystem/maven/deploy-to-mavencentral.sh @@ -32,6 +32,7 @@ function red() { function cleanup { echo "Removing settings" rm settings.xml + rm pwd.txt } if [ $# -eq 0 ] @@ -97,6 +98,12 @@ unzip -P $pass settings.xml.zip trap cleanup EXIT + +file="pwd.txt" + +PWD=$(cat "$file") + + if [ -z "$LIBVLC_VERSION" ]; then purple "No version for libvlc. Skipping" else @@ -109,10 +116,13 @@ else -Dfile=$BASE_DIR/libvlc-all-$LIBVLC_VERSION.aar \ -Dsources=$BASE_DIR/libvlc-all-$LIBVLC_VERSION-sources.jar \ -Djavadoc=$BASE_DIR/libvlc-all-$LIBVLC_VERSION-javadoc.jar \ - -Durl="https://s01.oss.sonatype.org/service/local/staging/deploy/maven2" \ + -Durl="https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/" \ -DgroupId=org.videolan.android \ -Dgpg.keyname=49A7E6FE58DCF183F0B349DFB83763AD62ED0721 \ - -DrepositoryId=ossrh + -DrepositoryId=central + curl -H "Authorization: Bearer $PWD" \ + -X POST \ + https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/org.videolan fi if [ -z "$MEDIALIB_VERSION" ]; then @@ -127,10 +137,13 @@ else -Dfile=$BASE_DIR/medialibrary-all-$MEDIALIB_VERSION.aar \ -Dsources=$BASE_DIR/medialibrary-all-$MEDIALIB_VERSION-sources.jar \ -Djavadoc=$BASE_DIR/medialibrary-all-$MEDIALIB_VERSION-javadoc.jar \ - -Durl="https://s01.oss.sonatype.org/service/local/staging/deploy/maven2" \ + -Durl="https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/" \ -DgroupId=org.videolan.android \ -Dgpg.keyname=49A7E6FE58DCF183F0B349DFB83763AD62ED0721 \ - -DrepositoryId=ossrh + -DrepositoryId=central + curl -H "Authorization: Bearer $PWD" \ + -X POST \ + https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/org.videolan fi if [ -z "$REMOTE_ACCESS_VERSION" ]; then @@ -145,10 +158,13 @@ else -Dfile=$BASE_DIR/remote-access-$REMOTE_ACCESS_VERSION.aar \ -Dsources=$BASE_DIR/remote-access-$REMOTE_ACCESS_VERSION-sources.jar \ -Djavadoc=$BASE_DIR/remote-access-$REMOTE_ACCESS_VERSION-javadoc.jar \ - -Durl="https://s01.oss.sonatype.org/service/local/staging/deploy/maven2" \ + -Durl="https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/" \ -DgroupId=org.videolan.android \ -Dgpg.keyname=49A7E6FE58DCF183F0B349DFB83763AD62ED0721 \ - -DrepositoryId=ossrh + -DrepositoryId=central + curl -H "Authorization: Bearer $PWD" \ + -X POST \ + https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/org.videolan fi diff --git a/gradle.properties b/gradle.properties index 3a78597dc..590356bcf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ POM_DEVELOPER_ID=videolan POM_DEVELOPER_NAME=VideoLAN POM_DEVELOPER_URL=https://www.videolan.org/ -RELEASE_SIGNING_ENABLED=false +signAllPublications=false android.nonTransitiveRClass=false android.nonFinalResIds=false