From 1f398fa04d3f5fad1bb44ea238ac1016e13523eb Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Sat, 23 Mar 2024 16:26:52 +0100 Subject: [PATCH 1/2] Fix 'get_version_name' to not include whitespaces Fix 'sed2' function whitespace issue. --- scripts/inc.functions.sh | 11 ++++------- scripts/release | 4 ++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/inc.functions.sh b/scripts/inc.functions.sh index 46d9d35..d6313d3 100644 --- a/scripts/inc.functions.sh +++ b/scripts/inc.functions.sh @@ -31,13 +31,10 @@ safe() { } sed2() { - _args=$(echo "${@}" | cut -d" " -f2-) - sed -i'.bak' "$1" "${_args}" - for file in ${_args}; do + cmd="${1}" + shift + sed -i'.bak' "${cmd}" "${@}" + for file in "${@}"; do rm "${file}.bak" done } - -get_version_name() { - grep "version = " "$1" | xargs | cut -d"=" -f2 -} diff --git a/scripts/release b/scripts/release index dcab965..9dcd834 100755 --- a/scripts/release +++ b/scripts/release @@ -26,6 +26,10 @@ function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1" } +get_version_name() { + grep "version = " "$1" | cut -d"=" -f2 | xargs +} + # Checks if [[ $# -ne 1 ]]; then usage From c0e73bc43a470e88d536873c6f19f61fb04209c5 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Sat, 23 Mar 2024 16:45:41 +0100 Subject: [PATCH 2/2] Release version 1.2.4 Signed-off-by: Sascha Peilicke --- CHANGELOG.md | 2 ++ README.md | 2 +- log4k-slf4j/build.gradle.kts | 2 +- log4k/build.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb40211..45e603b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [1.2.4] - 2024-03-23 ### Changed - Allow empty log messages if you only want to create a log entry about a function being called. - Add more Apple ARM64 platforms: macOS, tvOS, watchOS diff --git a/README.md b/README.md index d4b1a8d..ef1575b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ repositories { } dependencies { - implementation("de.peilicke.sascha:log4k:1.2.3") + implementation("de.peilicke.sascha:log4k:1.2.4") } ``` diff --git a/log4k-slf4j/build.gradle.kts b/log4k-slf4j/build.gradle.kts index 355fb3b..54d835e 100644 --- a/log4k-slf4j/build.gradle.kts +++ b/log4k-slf4j/build.gradle.kts @@ -39,7 +39,7 @@ android { } group = "de.peilicke.sascha" -version = "1.2.3" +version = "1.2.4" publishing { publications.withType { diff --git a/log4k/build.gradle.kts b/log4k/build.gradle.kts index 80e47bb..2c47df6 100644 --- a/log4k/build.gradle.kts +++ b/log4k/build.gradle.kts @@ -50,7 +50,7 @@ android { } group = "de.peilicke.sascha" -version = "1.2.3" +version = "1.2.4" publishing { publications.withType {