Compare commits

...

3 commits

7 changed files with 11 additions and 101 deletions

View file

@ -37,7 +37,7 @@ jobs:
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
- name: Validate Gradle wrapper - name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2 uses: gradle/actions/wrapper-validation@v4
- name: Cache Kotlin Konan - name: Cache Kotlin Konan
uses: actions/cache@v4 uses: actions/cache@v4
@ -46,7 +46,7 @@ jobs:
key: kotlin-konan-${{ runner.os }} key: kotlin-konan-${{ runner.os }}
- name: Set up Gradle - name: Set up Gradle
uses: gradle/actions/setup-gradle@v3 uses: gradle/actions/setup-gradle@v4
- name: Publish - name: Publish
run: ./gradlew check build --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }} run: ./gradlew check build --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}

View file

@ -4,8 +4,8 @@ on:
workflow_dispatch: workflow_dispatch:
env: env:
ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME}} ORG_GRADLE_PROJECT_centralUsername: ${{ secrets.CENTRAL_USERNAME}}
ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD}} ORG_GRADLE_PROJECT_centralPassword: ${{ secrets.CENTRAL_PASSWORD}}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }} ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }} ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }}
@ -29,7 +29,7 @@ jobs:
distribution: "zulu" distribution: "zulu"
- name: Validate Gradle wrapper - name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v2 uses: gradle/actions/wrapper-validation@v4
- name: Cache Kotlin Konan - name: Cache Kotlin Konan
uses: actions/cache@v4 uses: actions/cache@v4
@ -38,7 +38,7 @@ jobs:
key: kotlin-konan-${{ runner.os }} key: kotlin-konan-${{ runner.os }}
- name: Set up Gradle - name: Set up Gradle
uses: gradle/actions/setup-gradle@v3 uses: gradle/actions/setup-gradle@v4
- name: Publish - name: Publish
run: ./gradlew publish --no-parallel --stacktrace run: ./gradlew publish --no-parallel --stacktrace

View file

@ -4,7 +4,7 @@ plugins {
} }
group = "net.thauvin.erik.urlencoder" group = "net.thauvin.erik.urlencoder"
version = "1.6.0" version = "1.6.1-SNAPSHOT"
dependencies { dependencies {
kover(projects.urlencoderLib) kover(projects.urlencoderLib)

View file

@ -6,7 +6,7 @@ dependencies {
implementation("com.github.ben-manes:gradle-versions-plugin:0.51.0") implementation("com.github.ben-manes:gradle-versions-plugin:0.51.0")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.7") implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.7")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20") 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.jetbrains.kotlinx:kover-gradle-plugin:0.8.3")
implementation("org.apache.httpcomponents:httpclient:4.5.13") implementation("org.apache.httpcomponents:httpclient:4.5.13")
} }

View file

@ -57,12 +57,12 @@ publishing {
repositories { repositories {
maven( maven(
if (isSnapshotVersion()) { if (isSnapshotVersion()) {
uri("https://oss.sonatype.org/content/repositories/snapshots/") uri("https://central.sonatype.com/repository/maven-snapshots/")
} else { } 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) credentials(PasswordCredentials::class)
} }
} }

View file

@ -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 <tag>"
exit 2
end

View file

@ -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"