From f4b959c4dd5ac0845084b86f477f083e2519cbb4 Mon Sep 17 00:00:00 2001 From: "forkline-dev[bot]" Date: Mon, 21 Sep 2026 05:37:04 +0000 Subject: [PATCH 1/3] release: 1.23.0 --- CHANGELOG.md | 6 ++++++ app/version.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd32a7bf3..da1381ff6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file ## [Unreleased] +## [1.23.0] - 2026-09-21 + +### Fixed + +- Corrected requireNotNull ordering in VersioningPlugin so null checks work as intended + ## [1.22.0] - 2026-09-21 ### Added diff --git a/app/version.properties b/app/version.properties index 618570160..f25788280 100644 --- a/app/version.properties +++ b/app/version.properties @@ -2,4 +2,4 @@ # This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY. # versioning-plugin.versionCode=12300 -versioning-plugin.versionName=1.23.0-SNAPSHOT +versioning-plugin.versionName=1.23.0 From da93efe468d94c8ccecf505f2294cd32a9d401ed Mon Sep 17 00:00:00 2001 From: "forkline-dev[bot]" Date: Mon, 21 Sep 2026 05:57:05 +0000 Subject: [PATCH 2/3] fix: correct KDoc, remove dead code, fix typo in build-logic - Fix VersioningPlugin KDoc: says BuildDir but code uses projectDirectory - Remove unused isSnapshot() method from ApplicationPlugin - Fix double-negative typo in PSLUpdateTask error message --- .../kotlin/app/passwordstore/gradle/ApplicationPlugin.kt | 7 ------- .../kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt | 2 +- .../passwordstore/gradle/versioning/VersioningPlugin.kt | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt index 088dba618..b96074866 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt @@ -55,11 +55,4 @@ class ApplicationPlugin : Plugin { } } - private fun Project.isSnapshot(): Boolean { - with(providers) { - val workflow = environmentVariable("GITHUB_WORKFLOW") - val snapshot = environmentVariable("SNAPSHOT") - return workflow.isPresent || snapshot.isPresent - } - } } diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt index 2fc792b55..6fea62572 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt @@ -75,7 +75,7 @@ abstract class PSLUpdateTask : DefaultTask() { @Suppress("TooGenericExceptionThrown", "ThrowsCount") private fun assertWildcardRule(rule: String) { if (rule.indexOf(WILDCARD_CHAR) != 0) { - throw RuntimeException("Wildcard is not not in leftmost position") + throw RuntimeException("Wildcard is not in leftmost position") } if (rule.indexOf(WILDCARD_CHAR, 1) != -1) { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt index 0a1331818..de26d39c5 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt @@ -20,7 +20,7 @@ import org.gradle.kotlin.dsl.withType /** * A Gradle [Plugin] that takes a [Project] with the [AppPlugin] applied and dynamically sets the * versionCode and versionName properties based on values read from a [VERSIONING_PROP_FILE] file in - * the [Project.getBuildDir] directory. It also adds Gradle tasks to bump the major, minor, and + * the project directory. It also adds Gradle tasks to bump the major, minor, and * patch versions along with one to prepare the next snapshot. */ @Suppress("Unused") From 145e8db9f826e5427d7fb373fdfe50f6cf24be7e Mon Sep 17 00:00:00 2001 From: "forkline-dev[bot]" Date: Mon, 21 Sep 2026 06:13:30 +0000 Subject: [PATCH 3/3] style: apply spotless formatting fixes --- .../main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt | 1 - .../app/passwordstore/gradle/versioning/VersioningPlugin.kt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt index b96074866..96f2ea93e 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ApplicationPlugin.kt @@ -54,5 +54,4 @@ class ApplicationPlugin : Plugin { project.configureBuildSigning() } } - } diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt index de26d39c5..7c0c50a2c 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/versioning/VersioningPlugin.kt @@ -20,8 +20,8 @@ import org.gradle.kotlin.dsl.withType /** * A Gradle [Plugin] that takes a [Project] with the [AppPlugin] applied and dynamically sets the * versionCode and versionName properties based on values read from a [VERSIONING_PROP_FILE] file in - * the project directory. It also adds Gradle tasks to bump the major, minor, and - * patch versions along with one to prepare the next snapshot. + * the project directory. It also adds Gradle tasks to bump the major, minor, and patch versions + * along with one to prepare the next snapshot. */ @Suppress("Unused") class VersioningPlugin : Plugin {