From 4f3ee3ea57582c8c04ed4e1d3016370f49c79cbf Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 29 Jul 2021 09:33:57 -0700 Subject: [PATCH] Bump gradle-maven-publish-plugin from 0.16.0 to 0.17.0 Summary: From the changelog: > Removed the deprecated uploadArchives and installArchives tasks. Use publish and publishToMavenLocal instead. Made the necessary changes to docs and scripts. Reviewed By: nikoant Differential Revision: D29752895 fbshipit-source-id: 6e96c7ea9b26be2acb40b9089cb361837ab10a1b --- .github/workflows/publish-android.yml | 2 +- build.gradle | 4 ++-- docs/extending/public-releases.mdx | 2 +- scripts/publish-android-snapshot.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml index 1c6ce7263..9a8bbf42a 100644 --- a/.github/workflows/publish-android.yml +++ b/.github/workflows/publish-android.yml @@ -40,7 +40,7 @@ jobs: - name: Build artifacts run: ./gradlew :sample:assembleDebug :sample:assembleRelease && ./gradlew :android:assembleRelease - name: Upload Archives - run: ./gradlew uploadArchives --no-parallel --no-daemon + run: ./gradlew publish --no-parallel --no-daemon - name: Release and close run: ./gradlew closeAndReleaseRepository - name: Clean secrets diff --git a/build.gradle b/build.gradle index 1eb565704..77fc59b99 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.2.1' - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.16.0' + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0" } @@ -24,7 +24,7 @@ plugins { } ext.isSnapshot = { VERSION_NAME.endsWith('-SNAPSHOT') } -ext.isRelease = { ['uploadArchives', 'bintrayUpload'].any { gradle.startParameter.taskNames.contains(it) } } +ext.isRelease = { ['publish', 'publishToMavenLocal'].any { gradle.startParameter.taskNames.contains(it) } } subprojects { repositories { diff --git a/docs/extending/public-releases.mdx b/docs/extending/public-releases.mdx index ed8d6f7c9..ad4acc838 100644 --- a/docs/extending/public-releases.mdx +++ b/docs/extending/public-releases.mdx @@ -127,7 +127,7 @@ involves creating a JIRA account and opening an issue to apply for the `com.face to find an existing member of this namespace to vouch for you. While this is a lot, it ensures that nobody from outside the organisation can publish under our name. -The `uploadArchives` gradle task uses the OSSRH Sonatype Nexus credentials to upload all Flipper Java artifacts. That +The `publish` (previously `uploadArchives`) gradle task uses the OSSRH Sonatype Nexus credentials to upload all Flipper Java artifacts. That includes the core SDK as well as our plugins. The credentials are *not* your login to Nexus, but the user tokens you can get from [your profile](https://oss.sonatype.org/#profile;User%20Token). diff --git a/scripts/publish-android-snapshot.sh b/scripts/publish-android-snapshot.sh index 53b7a10fe..1eeda28c6 100755 --- a/scripts/publish-android-snapshot.sh +++ b/scripts/publish-android-snapshot.sh @@ -17,5 +17,5 @@ elif [ "$IS_SNAPSHOT" == "" ]; then exit 1 else openssl aes-256-cbc -d -in scripts/gradle-publish-keys.enc -k "$ANDROID_PUBLISH_KEY" >> "$BASEDIR/gradle.properties" - "$BASEDIR"/gradlew uploadArchives + "$BASEDIR"/gradlew publish fi