From 222935ad8eaa274aae185b8cb64fae84c1226ede Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 5 Oct 2021 15:17:17 -0700 Subject: [PATCH] Pass version as property --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly-no-cache.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/pr.yml | 2 +- conventions/build.gradle.kts | 5 +++-- gradle-plugins/build.gradle.kts | 1 - 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 470ccee2000d..0f0129f38057 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -276,7 +276,7 @@ jobs: run: ./gradlew publishToMavenLocal -x javadoc - name: Local publish of gradle plugins - run: ../gradlew publishToMavenLocal + run: ../gradlew publishToMavenLocal -Pversion=1.7.0-alpha-SNAPSHOT working-directory: gradle-plugins - name: Build distro diff --git a/.github/workflows/nightly-no-cache.yml b/.github/workflows/nightly-no-cache.yml index 64e2d77e5348..cb65534dfe06 100644 --- a/.github/workflows/nightly-no-cache.yml +++ b/.github/workflows/nightly-no-cache.yml @@ -180,7 +180,7 @@ jobs: run: ./gradlew publishToMavenLocal --no-build-cache -x javadoc - name: Local publish of gradle plugins - run: ../gradlew publishToMavenLocal + run: ../gradlew publishToMavenLocal -Pversion=1.7.0-alpha-SNAPSHOT working-directory: gradle-plugins - name: Build distro diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 78d48fe1d04a..bd482a8f5956 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -276,7 +276,7 @@ jobs: run: ./gradlew publishToMavenLocal -x javadoc - name: Local publish of gradle plugins - run: ../gradlew publishToMavenLocal + run: ../gradlew publishToMavenLocal -Pversion=1.7.0-alpha-SNAPSHOT working-directory: gradle-plugins - name: Build distro diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1f97dae628aa..c828ba34dd3b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -277,7 +277,7 @@ jobs: run: ./gradlew publishToMavenLocal -x javadoc - name: Local publish of gradle plugins - run: ../gradlew publishToMavenLocal + run: ../gradlew publishToMavenLocal -Pversion=1.7.0-alpha-SNAPSHOT working-directory: gradle-plugins - name: Build distro diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index 627566fa2322..e29451f17fe0 100644 --- a/conventions/build.gradle.kts +++ b/conventions/build.gradle.kts @@ -29,8 +29,9 @@ dependencies { implementation(gradleApi()) implementation(localGroovy()) - implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:1.7.0-alpha-SNAPSHOT") - implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:1.7.0-alpha-SNAPSHOT") + // these two dependencies are always substituted (see settings.gradle.kts in this directory) + implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin") + implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin") implementation("org.eclipse.aether:aether-connector-basic:1.1.0") implementation("org.eclipse.aether:aether-transport-http:1.1.0") diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 3d1ac2dadfde..a396967814ad 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -9,7 +9,6 @@ plugins { } group = "io.opentelemetry.instrumentation" -version = "1.7.0-alpha-SNAPSHOT" repositories { mavenCentral()