diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d30a794..cf2f4256 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,5 +25,8 @@ jobs: - name: Reclaim memory run: ./gradlew --stop && jps|grep -E 'KotlinCompileDaemon|GradleDaemon'| awk '{print $1}'| xargs kill -9 || true - name: Upload snapshot (main only) - if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && matrix.ci_kotlin_version == '1.5.31' && matrix.ci_string_concat == 'inline' - run: ./gradlew publish -x dokkaHtml --no-parallel -PmavenCentralUsername=${{ secrets.SonatypeUsername }} -PmavenCentralPassword=${{ secrets.SonatypePassword }} + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SonatypeUsername }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SonatypePassword }} + if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && matrix.ci_kotlin_version == '1.6.0-RC' && matrix.ci_string_concat == 'inline' + run: ./publish.sh --snapshot diff --git a/CHANGELOG.md b/CHANGELOG.md index 362b81e6..4200c566 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,18 @@ Changelog ========= -0.8.1 +0.8.2 ------------ _2021-10-12_ -* Support for Kotlin 1.6 (built against 1.6.0-RC). This release should only be used for testing with Kotlin 1.6 previews. +* Support for Kotlin 1.6 (built against `1.6.0-RC`). This release should only be used for testing with Kotlin 1.6 previews. + + +0.8.1 +------------ + +This release was accidentally broken and should not be used! 0.8.0 ------------ diff --git a/RELEASING.md b/RELEASING.md index 39c81679..97217564 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -2,10 +2,11 @@ Releasing ========= 1. Change the version in `gradle.properties` to a non-SNAPSHOT version. + * Note - do this in both the top-level file and `redacted-compiler-plugin-gradle` 2. Update `CHANGELOG.md` for the impending release. 3. `git commit -am "Prepare for release X.Y.Z."` (where X.Y.Z is the new version) 4. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version) -5. `./gradlew publish --no-parallel -x dokkaHtml && ./gradlew closeAndReleaseRepository` +5. `./publish && ./gradlew closeAndReleaseRepository` 6. Update `gradle.properties` to the next SNAPSHOT version. 7. `git commit -am "Prepare next development version."` 8. `git push && git push --tags` diff --git a/gradle.properties b/gradle.properties index 795c3e9f..4b6a3784 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ kotlin.daemon.jvmargs=-Xmx1g -Dfile.encoding=UTF-8 \ --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED GROUP=dev.zacsweers.redacted -VERSION_NAME=1.0.0-SNAPSHOT +VERSION_NAME=0.8.2 POM_DESCRIPTION=A Kotlin compiler plugin that generates redacted toString() implementations. POM_URL=https://github.com/ZacSweers/redacted-compiler-plugin/ POM_SCM_URL=https://github.com/ZacSweers/redacted-compiler-plugin/ diff --git a/publish.sh b/publish.sh new file mode 100755 index 00000000..8348e821 --- /dev/null +++ b/publish.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [[ "$1" = "--snapshot" ]]; then snapshot=true; fi +if [[ "$1" = "--local" ]]; then local=true; fi + +if ! [[ ${local} ]]; then + ./gradlew -p redacted-compiler-plugin-gradle clean publish --no-daemon --no-parallel -x dokkaHtml + ./gradlew clean publish --no-daemon --no-parallel -x dokkaHtml + if ! [[ ${snapshot} ]]; then + ./gradlew -p redacted-compiler-plugin-gradle closeAndReleaseRepository + fi +else + ./gradlew -p redacted-compiler-plugin-gradle clean install --no-daemon --no-parallel -x dokkaHtml + ./gradlew clean install --no-daemon --no-parallel -x dokkaHtml +fi \ No newline at end of file diff --git a/redacted-compiler-plugin-gradle/gradle.properties b/redacted-compiler-plugin-gradle/gradle.properties index 5256eca7..b4a34763 100644 --- a/redacted-compiler-plugin-gradle/gradle.properties +++ b/redacted-compiler-plugin-gradle/gradle.properties @@ -27,7 +27,7 @@ kotlin.daemon.jvmargs=-Xmx1g -Dfile.encoding=UTF-8 \ --add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED GROUP=dev.zacsweers.redacted -VERSION_NAME=1.0.0-SNAPSHOT +VERSION_NAME=0.8.2 POM_DESCRIPTION=A Kotlin compiler plugin that generates redacted toString() implementations. POM_URL=https://github.com/ZacSweers/redacted-compiler-plugin/ POM_SCM_URL=https://github.com/ZacSweers/redacted-compiler-plugin/