From 6951bcff44a71cc963d507dbc5a7e621daa291b5 Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Fri, 26 Jul 2024 11:37:54 +0200 Subject: [PATCH 1/5] ci: Sign snapshots --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ca3b8b..57d7bd7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,6 +51,8 @@ jobs: env: ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }} ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }} samples: name: Verify samples From 67ff2c6e3cbc2c897d99c671fc6c379f8bae25bd Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Mon, 29 Jul 2024 11:04:28 +0200 Subject: [PATCH 2/5] version: 0.19.1-SNAPSHOT --- gradle.properties | 2 +- samples/android-application-multi/build.gradle.kts | 2 +- samples/android-application/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0941785..2cc9b1f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=com.redmadrobot.build -version=0.19 +version=0.19.1-SNAPSHOT # Project-wide Gradle settings. diff --git a/samples/android-application-multi/build.gradle.kts b/samples/android-application-multi/build.gradle.kts index 5a0ef82..41e581c 100644 --- a/samples/android-application-multi/build.gradle.kts +++ b/samples/android-application-multi/build.gradle.kts @@ -1,6 +1,6 @@ plugins { // Versions of AGP and KGP are specified in buildSrc module - id("com.redmadrobot.android-config") version "0.19" + id("com.redmadrobot.android-config") version "0.19.1-SNAPSHOT" } // Common configurations for all modules diff --git a/samples/android-application/build.gradle.kts b/samples/android-application/build.gradle.kts index 623aa73..b2878b2 100644 --- a/samples/android-application/build.gradle.kts +++ b/samples/android-application/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.5.1" apply false kotlin("android") version "2.0.0" apply false - id("com.redmadrobot.android-config") version "0.19" + id("com.redmadrobot.android-config") version "0.19.1-SNAPSHOT" } // Common configurations for all modules From 8464197a8462a795a1a442327b9340b88f04bb82 Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Mon, 29 Jul 2024 11:07:46 +0200 Subject: [PATCH 3/5] fix: Fix package of SigningConfig.fromProperties --- CHANGELOG.md | 5 ++++- infrastructure-android/src/main/kotlin/dsl/Signing.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c68e432..cc55931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ## [Unreleased] -- *No changes* +### Fixes + +- Fixed package of the extension `SigningConfig.fromProperties`. \ + `dsl` → `com.redmadrobot.build.dsl` ## [0.19] (2024-07-26) diff --git a/infrastructure-android/src/main/kotlin/dsl/Signing.kt b/infrastructure-android/src/main/kotlin/dsl/Signing.kt index 6b79cf3..a4e0309 100644 --- a/infrastructure-android/src/main/kotlin/dsl/Signing.kt +++ b/infrastructure-android/src/main/kotlin/dsl/Signing.kt @@ -1,4 +1,4 @@ -package dsl +package com.redmadrobot.build.dsl import com.android.build.api.dsl.SigningConfig import org.gradle.api.Incubating From 2cf2eeb4bde5d50180547797a08dfff7adc2f6f3 Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Wed, 31 Jul 2024 15:48:24 +0200 Subject: [PATCH 4/5] docs: Add RELEASING.md --- RELEASING.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 RELEASING.md diff --git a/RELEASING.md b/RELEASING.md new file mode 100644 index 0000000..ee25c0e --- /dev/null +++ b/RELEASING.md @@ -0,0 +1,44 @@ +# Releasing + +**Release:** + +1. Ensure the repository is up to date and checkout the `develop` branch. + +2. [Update version](#version-update) and remove `-SNAPSHOT` suffix + +3. Update the `CHANGELOG.md`: + 1. Replace `Unreleased` section with the release version + 2. Add a link to the diff between the previous and the new version to the bottom of the changelog + 3. Add a new empty `Unreleased` section on the top of the file + +4. Commit and push the changes. + ```bash + git commit -am "version: [version here]" + git push + ``` + +5. Merge the `develop` branch into `main` using fast-forward. + +6. Create a release tag on the `main` branch: + ```bash + # Push the release tag + git tag [version] + git push origin [version] + ``` + Release tag push triggers a release workflow on the CI which uploads release artifacts to Maven Central and creates a GitHub release. + +**After release:** + +1. Rename [milestone](https://github.com/RedMadRobot/gradle-infrastructure/milestones) "Next" to the released version and close it. +2. Create a new milestone with the name "Next." +3. In the `develop` branch [update version](#version-update) to the next potential version with suffix `-SNAPSHOT`. +4. Commit and push. + ```bash + git commit -am "version: [version here]-SNAPSHOT" + git push + ``` + +## Version Update + +1. Update a version in `gradle.properties` and `README.md` +2. Update a version used in samples in `build.gradle.kts` From 0c0e1ca8dfb3422a79676d5070e7af1613f9681f Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Wed, 31 Jul 2024 15:57:15 +0200 Subject: [PATCH 5/5] version: 0.19.1 --- CHANGELOG.md | 5 +++++ README.md | 14 +++++++------- gradle.properties | 2 +- samples/android-application-multi/build.gradle.kts | 2 +- samples/android-application/build.gradle.kts | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc55931..29a7525 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased] +- *No changes* + +## [0.19.1] (2024-07-31) + ### Fixes - Fixed package of the extension `SigningConfig.fromProperties`. \ @@ -724,6 +728,7 @@ Pull request: #35 - Added CHANGELOG.md :) [unreleased]: https://github.com/RedMadRobot/gradle-infrastructure/compare/main..develop +[0.19.1]: https://github.com/RedMadRobot/gradle-infrastructure/compare/v0.19..v0.19.1 [0.19]: https://github.com/RedMadRobot/gradle-infrastructure/compare/v0.18.1..v0.19 [0.18.1]: https://github.com/RedMadRobot/gradle-infrastructure/compare/v0.18..v0.18.1 [0.18]: https://github.com/RedMadRobot/gradle-infrastructure/compare/v0.17..v0.18 diff --git a/README.md b/README.md index 4c84905..786fc6e 100644 --- a/README.md +++ b/README.md @@ -53,15 +53,15 @@ pluginManagement { } ``` -Then you can apply any of plugins where you need: +Then you can apply any of the plugins where you need: ```kotlin plugins { - id("com.redmadrobot.kotlin-library") version "0.19" - id("com.redmadrobot.publish") version "0.19" - id("com.redmadrobot.detekt") version "0.19" - id("com.redmadrobot.application") version "0.19" - id("com.redmadrobot.android-library") version "0.19" + id("com.redmadrobot.kotlin-library") version "0.19.1" + id("com.redmadrobot.publish") version "0.19.1" + id("com.redmadrobot.detekt") version "0.19.1" + id("com.redmadrobot.application") version "0.19.1" + id("com.redmadrobot.android-library") version "0.19.1" } ``` @@ -496,7 +496,7 @@ redmadrobot { > [!WARNING] > This feature is deprecated and is disabled by default since v0.19 -> Currently you can enable this behavior, though this option may be deleted at some point. +> Currently, you can enable this behavior, though this option may be deleted at some point. Infrastructure plugins can automatically add required repositories: diff --git a/gradle.properties b/gradle.properties index 2cc9b1f..f41b7b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=com.redmadrobot.build -version=0.19.1-SNAPSHOT +version=0.19.1 # Project-wide Gradle settings. diff --git a/samples/android-application-multi/build.gradle.kts b/samples/android-application-multi/build.gradle.kts index 41e581c..51f2bb6 100644 --- a/samples/android-application-multi/build.gradle.kts +++ b/samples/android-application-multi/build.gradle.kts @@ -1,6 +1,6 @@ plugins { // Versions of AGP and KGP are specified in buildSrc module - id("com.redmadrobot.android-config") version "0.19.1-SNAPSHOT" + id("com.redmadrobot.android-config") version "0.19.1" } // Common configurations for all modules diff --git a/samples/android-application/build.gradle.kts b/samples/android-application/build.gradle.kts index b2878b2..0855850 100644 --- a/samples/android-application/build.gradle.kts +++ b/samples/android-application/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.android.application") version "8.5.1" apply false kotlin("android") version "2.0.0" apply false - id("com.redmadrobot.android-config") version "0.19.1-SNAPSHOT" + id("com.redmadrobot.android-config") version "0.19.1" } // Common configurations for all modules