wip: merge with master

kepler16 · Feb 12, 2024 · 6eb01f5 · 6eb01f5
1 parent 0a751b9
commit 6eb01f5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/build/build.clj b/build/build.clj
@@ -41,6 +41,25 @@
   (b/jar {:class-dir class-dir
           :jar-file jar-file}))
 
+(defn build-uber-native [_]
+  (b/write-pom {:class-dir class-dir
+                :lib lib
+                :version version
+                :basis @basis
+                :src-dirs ["src"]
+                :pom-data [[:description "Clojure monorepo tools"]
+                           [:url "https://github.com/kepler16/kmono"]
+                           [:licenses
+                            [:license
+                             [:name "MIT"]
+                             [:url "https://opensource.org/license/mit"]]]]})
+
+  (b/copy-dir {:src-dirs ["src"]
+               :target-dir class-dir})
+
+  (b/jar {:class-dir class-dir
+          :jar-file jar-file}))
+
 (defn release [_]
   (deps-deploy/deploy {:installer :remote
                        :artifact (b/resolve-path jar-file)

diff --git a/packages/kmono/deps.edn b/packages/kmono/deps.edn
@@ -17,10 +17,6 @@
  :aliases {:build {:deps {local/build {:local/root "../../build"}}
                    :ns-default build}
            :lib {:k16/metabuild {:kind :jar}}
-           :uber {:k16/metabuild {:kind :uber
-                                  :main k16.kmono.main}}
            :native {:extra-deps {com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}}}
            :test {:extra-paths ["test"]
-                  :extra-deps {lambdaisland/kaocha {:mvn/version "1.86.1355"}}}
-           :meta {:deps {kepler16/metabuild {:mvn/version "0.10.0"}}
-                  :ns-default k16.metabuild.api}}}
+                  :extra-deps {lambdaisland/kaocha {:mvn/version "1.86.1355"}}}}}
diff --git a/packages/kmono/src/k16/kmono/adapters/clojure_deps.clj b/packages/kmono/src/k16/kmono/adapters/clojure_deps.clj
@@ -47,7 +47,7 @@
   ([package-path]
    (->adapter package-path 10000))
   ([package-path timeout-ms]
-   (let [deps-edn (read-deps-edn package-path)
+   (let [deps-edn (read-deps-edn! package-path)
          kmono-config (:kmono/config deps-edn)]
      (when kmono-config
        (let [{:keys [group artifact] :as config}

diff --git a/packages/kmono/src/k16/kmono/api.clj b/packages/kmono/src/k16/kmono/api.clj
@@ -1,6 +1,5 @@
 (ns k16.kmono.api
   (:require
-   [babashka.process :as bp]
    [clojure.string :as string]
    [k16.kmono.ansi :as ansi]
    [k16.kmono.config :as config]