From b882d68d4c3f6797ec23b0a293be1de9006c4767 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 20 Oct 2024 18:24:53 -0700 Subject: [PATCH 1/3] Removed git-cliff configuration and script --- cliff.fish | 10 ------- cliff.toml | 80 ------------------------------------------------------ 2 files changed, 90 deletions(-) delete mode 100755 cliff.fish delete mode 100644 cliff.toml diff --git a/cliff.fish b/cliff.fish deleted file mode 100755 index 9dd90da..0000000 --- a/cliff.fish +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env fish - -set scriptname (basename (status -f)) - -if test (count $argv) -eq 1 - git cliff --unreleased --tag "$argv" -else - echo "Usage: $scriptname " - exit 2 -end diff --git a/cliff.toml b/cliff.toml deleted file mode 100644 index 8906a36..0000000 --- a/cliff.toml +++ /dev/null @@ -1,80 +0,0 @@ -# git-cliff ~ configuration file -# https://git-cliff.org/docs/configuration - -[remote.github] -owner = "ethauvin" -repo = "urlencoder" -token = "" - -[changelog] -# template for the changelog body -# https://keats.github.io/tera/docs/#introduction -body = """ -## What's Changed - -{%- if version %} in {{ version }}{%- endif -%} -{% for commit in commits %} - {% if commit.remote.pr_title -%} - {%- set commit_message = commit.remote.pr_title -%} - {%- else -%} - {%- set commit_message = commit.message -%} - {%- endif -%} - * {{ commit_message | split(pat="\n") | first | trim }}\ - {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif -%} - {% if commit.remote.pr_number %} in \ - [#{{ commit.remote.pr_number }}]({{ self::remote_url() }}/pull/{{ commit.remote.pr_number }}) \ - {%- else %} in \ - [{{ commit.id | truncate(length=7, end="") }}]({{ self::remote_url() }}/commit/{{ commit.id }}) \ - {%- endif %} -{%- endfor -%} - -{%- if github -%} -{% if github.contributors | filter(attribute="is_first_time", value=true) | length != 0 %} - {% raw %}\n{% endraw -%} - ## New Contributors -{%- endif %}\ -{% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %} - * @{{ contributor.username }} made their first contribution - {%- if contributor.pr_number %} in \ - [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \ - {%- endif %} -{%- endfor -%} -{%- endif -%} - -{% if version %} - {% if previous.version %} - **Full Changelog**: {{ self::remote_url() }}/compare/{{ previous.version }}...{{ version }} - {% endif %} -{% else -%} - {% raw %}\n{% endraw %} -{% endif %} - -{%- macro remote_url() -%} - https://github.com/{{ remote.github.owner }}/{{ remote.github.repo }} -{%- endmacro -%} -""" -# remove the leading and trailing whitespace from the template -trim = true -# template for the changelog footer -#footer = "" -# postprocessors -postprocessors = [] - -[git] -# parse the commits based on https://www.conventionalcommits.org -conventional_commits = false -# filter out the commits that are not conventional -filter_unconventional = true -# process each line of a commit as an individual commit -split_commits = false -# regex for preprocessing the commit messages -commit_preprocessors = [ - # remove issue numbers from commits - { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "" }, -] -# filter out the commits that are not matched by commit parsers -filter_commits = false -# sort the tags topologically -topo_order = false -# sort the commits inside sections by oldest/newest order -sort_commits = "newest" \ No newline at end of file From c9523752ae566d555630eda3c4026fc55ce0a9c4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 30 Jun 2025 21:28:48 -0700 Subject: [PATCH 2/3] Move from OSSRH to Maven Central --- .github/workflows/publish.yml | 4 ++-- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 2 +- .../main/kotlin/buildsrc/conventions/publishing.gradle.kts | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a930768..7d19922 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,8 +4,8 @@ on: workflow_dispatch: env: - ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME}} - ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD}} + ORG_GRADLE_PROJECT_centralUsername: ${{ secrets.CENTRAL_USERNAME}} + ORG_GRADLE_PROJECT_centralPassword: ${{ secrets.CENTRAL_PASSWORD}} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }} diff --git a/build.gradle.kts b/build.gradle.kts index 5ccf894..1e414d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "net.thauvin.erik.urlencoder" -version = "1.6.0" +version = "1.6.1-SNAPSHOT" dependencies { kover(projects.urlencoderLib) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1819780..692b29c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -6,7 +6,7 @@ dependencies { implementation("com.github.ben-manes:gradle-versions-plugin:0.51.0") implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.7") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25") implementation("org.jetbrains.kotlinx:kover-gradle-plugin:0.8.3") implementation("org.apache.httpcomponents:httpclient:4.5.13") } diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts index 6afd9e1..6acb7cc 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts @@ -57,12 +57,12 @@ publishing { repositories { maven( if (isSnapshotVersion()) { - uri("https://oss.sonatype.org/content/repositories/snapshots/") + uri("https://central.sonatype.com/repository/maven-snapshots/") } else { - uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") + uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/") } ) { - name = "ossrh" + name = "central" credentials(PasswordCredentials::class) } } From 1a92eec567c7fef40c48726f8ac8545306c2e639 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 30 Jun 2025 21:47:50 -0700 Subject: [PATCH 3/3] Update Gradle actions --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index a848665..a105bca 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -37,7 +37,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v2 + uses: gradle/actions/wrapper-validation@v4 - name: Cache Kotlin Konan uses: actions/cache@v4 @@ -46,7 +46,7 @@ jobs: key: kotlin-konan-${{ runner.os }} - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Publish run: ./gradlew check build --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7d19922..173bb59 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,7 +29,7 @@ jobs: distribution: "zulu" - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v2 + uses: gradle/actions/wrapper-validation@v4 - name: Cache Kotlin Konan uses: actions/cache@v4 @@ -38,7 +38,7 @@ jobs: key: kotlin-konan-${{ runner.os }} - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Publish run: ./gradlew publish --no-parallel --stacktrace