From fa5c32084133146300281b703dc3a4d1b51a2b2b Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Tue, 3 Aug 2021 12:34:54 +0300 Subject: [PATCH] Publish muzze plugins to Gradle Plugin Portal --- .github/workflows/gradle-plugins.yml | 12 +++++------- gradle-plugins/build.gradle.kts | 24 ++++++++++-------------- gradle-plugins/settings.gradle.kts | 1 - 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/.github/workflows/gradle-plugins.yml b/.github/workflows/gradle-plugins.yml index 4346ab302414..5e939ff35993 100644 --- a/.github/workflows/gradle-plugins.yml +++ b/.github/workflows/gradle-plugins.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: jobs: - snapshot: + publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 @@ -29,11 +29,9 @@ jobs: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - - name: Publish snapshot + - name: Publish plugins env: - SONATYPE_USER: ${{ secrets.SONATYPE_USER }} - SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }} - GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} - run: ../gradlew build publishToSonatype + GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} + GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }} + run: ../gradlew build publishPlugins working-directory: gradle-plugins diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index b2e63ef7163e..303dd7e7a9ef 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -5,11 +5,10 @@ plugins { `maven-publish` id("com.gradle.plugin-publish") - id("io.github.gradle-nexus.publish-plugin") } group = "io.opentelemetry.instrumentation" -version = "0.2.0-SNAPSHOT" +version = "0.3.0" repositories { mavenCentral() @@ -47,19 +46,16 @@ tasks.withType().configureEach { pluginBundle { website = "https://opentelemetry.io" vcsUrl = "https://github.com/open-telemetry/opentelemetry-java-instrumentation" - tags = listOf("opentelemetry", "instrumentation") + tags = listOf("opentelemetry", "instrumentation", "java") } -nexusPublishing { - packageGroup.set("io.opentelemetry") - - repositories { - sonatype { - username.set(System.getenv("SONATYPE_USER")) - password.set(System.getenv("SONATYPE_KEY")) +gradlePlugin { + plugins { + get("io.opentelemetry.instrumentation.muzzle-generation").apply { + displayName = "Muzzle safety net generation" + } + get("io.opentelemetry.instrumentation.muzzle-check").apply { + displayName = "Checks instrumented libraries against muzzle safety net" } } - - connectTimeout.set(Duration.ofMinutes(5)) - clientTimeout.set(Duration.ofMinutes(5)) -} +} \ No newline at end of file diff --git a/gradle-plugins/settings.gradle.kts b/gradle-plugins/settings.gradle.kts index b3f0658c13f3..f38bc494cf78 100644 --- a/gradle-plugins/settings.gradle.kts +++ b/gradle-plugins/settings.gradle.kts @@ -2,6 +2,5 @@ pluginManagement { plugins { id("com.gradle.plugin-publish") version "0.15.0" id("org.jetbrains.kotlin.jvm") version "1.5.10" - id("io.github.gradle-nexus.publish-plugin") version "1.1.0" } }