Compare commits

..

3 commits

Author SHA1 Message Date
bom
743418e6b1 bump version to: 6.4.2-SNAPSHOT 2024-07-02 14:39:59 +02:00
bom
8d124bbf81 release: 6.4.1 2024-07-02 14:39:59 +02:00
bom
b0faeab079 Fix logic for generating both config and auth
Should trigger if both or neither flag is set
2024-07-02 14:37:07 +02:00
3 changed files with 3 additions and 3 deletions

View file

@ -1,4 +1,4 @@
(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.4.1-SNAPSHOT"
(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.4.2-SNAPSHOT"
:description "Contains predicates and tools for c4k"
:url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0"

View file

@ -1,4 +1,4 @@
(defproject org.domaindrivenarchitecture/c4k-common-clj "6.4.1-SNAPSHOT"
(defproject org.domaindrivenarchitecture/c4k-common-clj "6.4.2-SNAPSHOT"
:description "Contains predicates and tools for c4k"
:url "https://domaindrivenarchitecture.org"
:license {:name "Apache License, Version 2.0"

View file

@ -59,7 +59,7 @@
only-config
only-auth]
(let [resulting-config (merge config-defaults my-config)
both (not (or only-config only-auth))
both (or (and only-config only-auth) (and (not only-config) (not only-auth)))
res-vec (cond
both (concat-vec (config-objects resulting-config) (auth-objects my-auth))
only-config (config-objects my-config)