diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index db84893..34eacc6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -21,7 +21,7 @@ jobs: permissions: contents: read pull-requests: read - uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@9ea4d20d64f99a1a05dd8c8f56504e5e2aa39ed7 + uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@161dace284ff29473ea607bf26f436f6bb46c057 secrets: BUILD_CACHE_AWS_REGION: ${{ secrets.BUILD_CACHE_AWS_REGION }} BUILD_CACHE_AWS_BUCKET: ${{ secrets.BUILD_CACHE_AWS_BUCKET }} diff --git a/.github/workflows/pr-clean-stale.yaml b/.github/workflows/pr-clean-stale.yaml index 66a6fb3..b0e2fcc 100644 --- a/.github/workflows/pr-clean-stale.yaml +++ b/.github/workflows/pr-clean-stale.yaml @@ -11,5 +11,5 @@ permissions: jobs: pr-clean-stale: - uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v0.14.1 + uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v1.0.0 secrets: inherit diff --git a/.github/workflows/pr-quality.yml b/.github/workflows/pr-quality.yml index bb49ace..6001a3a 100644 --- a/.github/workflows/pr-quality.yml +++ b/.github/workflows/pr-quality.yml @@ -14,5 +14,5 @@ concurrency: jobs: pr-checklist: - uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v0.14.1 + uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v1.0.0 secrets: inherit diff --git a/.github/workflows/publish-new-version.yml b/.github/workflows/publish-new-version.yml index 262d55a..73df9c0 100644 --- a/.github/workflows/publish-new-version.yml +++ b/.github/workflows/publish-new-version.yml @@ -12,6 +12,22 @@ on: - minor - major default: minor + suffix: + description: 'Optional version suffix (e.g. beta, rc01). A dash is added automatically.' + required: false + type: string + default: '' + publish-targets: + description: >- + Leave as-is. central is a manual escape hatch for a release that has to + go out when the Stream repository cannot take it. + required: false + type: choice + options: + - streamRepo + - streamRepo,central + - central + default: streamRepo concurrency: group: release @@ -32,9 +48,11 @@ jobs: permissions: contents: write needs: pre_release_check - uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@9ea4d20d64f99a1a05dd8c8f56504e5e2aa39ed7 + uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@161dace284ff29473ea607bf26f436f6bb46c057 with: bump: ${{ inputs.bump }} + suffix: ${{ inputs.suffix }} + publish-targets: ${{ inputs.publish-targets }} secrets: github-token: ${{ secrets.STREAM_PUBLIC_BOT_TOKEN }} maven-central-username: ${{ secrets.OSSRH_USERNAME }} @@ -43,3 +61,7 @@ jobs: signing-key-id: ${{ secrets.SIGNING_KEY_ID }} signing-key-password: ${{ secrets.SIGNING_PASSWORD }} slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_ANDROID_CICD }} + stream-repo-endpoint: ${{ secrets.STREAM_REPO_ENDPOINT }} + stream-repo-bucket: ${{ secrets.STREAM_REPO_BUCKET }} + stream-repo-access-key-id: ${{ secrets.STREAM_REPO_ACCESS_KEY_ID }} + stream-repo-secret-access-key: ${{ secrets.STREAM_REPO_SECRET_ACCESS_KEY }} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1c050c5..cae8ae3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ ksp = "2.2.0-2.0.2" robolectric = "4.15.1" detekt = "1.23.8" binaryCompatibilityValidator = "0.16.3" -streamConventions = "0.14.1" +streamConventions = "1.0.0" annotationJvm = "1.9.1" [libraries] diff --git a/settings.gradle.kts b/settings.gradle.kts index 8caea61..b4db527 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -30,6 +30,7 @@ pluginManagement { mavenCentral() gradlePluginPortal() maven("https://plugins.gradle.org/m2/") + maven("https://stream-io-repo.com") } } dependencyResolutionManagement {