Skip to content

Commit 35d99c7

Browse files
chore: Merge branch dev to main (#90)
2 parents 41842d8 + b9ea041 commit 35d99c7

4 files changed

Lines changed: 13 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [1.6.1-dev.1](https://github.com/MorpheApp/morphe-cli/compare/v1.6.0...v1.6.1-dev.1) (2026-03-22)
2+
3+
4+
### Bug Fixes
5+
6+
* Update to Patcher 1.3.1 ([39bdd44](https://github.com/MorpheApp/morphe-cli/commit/39bdd44d13cf99b855d4e8501a47283f0681cbe7))
7+
18
# [1.6.0](https://github.com/MorpheApp/morphe-cli/compare/v1.5.0...v1.6.0) (2026-03-22)
29

310

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
org.gradle.parallel = true
22
org.gradle.caching = true
33
kotlin.code.style = official
4-
version = 1.6.0
4+
version = 1.6.1-dev.1

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ kotlin = "2.3.0"
77
# CLI
88
picocli = "4.7.7"
99
arsclib = "9696ffecda"
10-
morphe-patcher = "1.3.0"
10+
morphe-patcher = "1.3.1"
1111
morphe-library = "1.3.0"
1212

1313
# Compose Desktop

src/test/kotlin/app/morphe/cli/command/PatchOptionsFileTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class PatchOptionsFileTest {
9696
@Test
9797
fun `mergeWithBundle preserves existing settings`(){
9898
// New patch from .mpp files comes with this default (enabled + light)
99-
val patch = rawResourcePatch(name = "Theme", description = "Change Theme", use = true){
99+
val patch = rawResourcePatch(name = "Theme", description = "Change Theme", default = true){
100100
option<String>(key = "colorScheme", default = "light")
101101
}
102102

@@ -120,9 +120,9 @@ class PatchOptionsFileTest {
120120
@Test
121121
fun `mergeWithBundle adds new Patch that didn't exist with default settings`(){
122122
// We add new Patch that didn't exist with default values
123-
val themePatch = rawResourcePatch(name = "Theme", description = "Change Theme", use = true) {}
123+
val themePatch = rawResourcePatch(name = "Theme", description = "Change Theme", default = true) {}
124124

125-
val adBlockPatch = rawResourcePatch(name = "AdBlocker", description = "Block Ads", use = true) {}
125+
val adBlockPatch = rawResourcePatch(name = "AdBlocker", description = "Block Ads", default = true) {}
126126

127127
val userBundle = PatchBundle(
128128
meta = PatchBundleMeta(),
@@ -137,7 +137,7 @@ class PatchOptionsFileTest {
137137
@Test
138138
fun `mergeWithBundle removes an old patch that no longer exists`(){
139139
// We remove an old patch that no longer exists
140-
val themePatch = rawResourcePatch(name = "Theme", description = "Change Theme", use = true) {}
140+
val themePatch = rawResourcePatch(name = "Theme", description = "Change Theme", default = true) {}
141141

142142
val userBundle = PatchBundle(
143143
meta = PatchBundleMeta(),

0 commit comments

Comments
 (0)