Remove babashka for regular clj

Author: bolivier

compiled_starters/clojure/.codecrafters/compile.sh

@@ -7,3 +7,5 @@
 # Learn more: https://codecrafters.io/program-interface
 
 set -e # Exit on failure
+
+clj -T:build

compiled_starters/clojure/.codecrafters/run.sh

@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-bb -m sqlite.core "$@"
+exec java -jar /tmp/codecrafters-build-sqlite-clojure/target.jar "$@"

compiled_starters/clojure/build.clj

@@ -2,22 +2,20 @@
   (:gen-class)
   (:require [clojure.tools.build.api :as b]))
 
-(def lib 'io.codecrafters.http-server)
-(def class-dir "/tmp/codecrafters-build-http-server-clojure/classes")
+(def lib 'io.codecrafters.sqlite)
+(def class-dir "/tmp/codecrafters-build-sqlite-clojure/classes")
 (def basis (b/create-basis {:project "deps.edn"}))
-(def uber-file "/tmp/codecrafters-build-http-server-clojure/target.jar")
+(def uber-file "/tmp/codecrafters-build-sqlite-clojure/target.jar")
 
-(defn clean
-  [_]
-  (b/delete {:path "/tmp/codecrafters-build-http-server-clojure"}))
+(defn clean [_] (b/delete {:path "/tmp/codecrafters-build-sqlite-clojure"}))
 
 (defn uber
   [_]
   (clean nil)
   (b/copy-dir {:src-dirs ["src"], :target-dir class-dir})
   (b/compile-clj
-    {:basis basis, :ns-compile '[http-server.core], :class-dir class-dir})
+    {:basis basis, :ns-compile '[sqlite.core], :class-dir class-dir})
   (b/uber {:class-dir class-dir,
            :uber-file uber-file,
            :basis basis,
-           :main 'http-server.core}))
+           :main 'sqlite.core}))

compiled_starters/clojure/src/sqlite/core.clj

@@ -1,30 +1,30 @@
 (ns sqlite.core
   (:gen-class)
-  (:require
-   [clojure.java.io :as io]))
+  (:require [clojure.java.io :as io]))
 
 (defn lazy-byte-seq [filepath]
   (let [is (io/input-stream filepath)
         step (fn step [input-stream]
-               (lazy-seq
-                (let [byte-val (.read input-stream)]
-                  (when (not= byte-val -1)
-                    (cons byte-val (step input-stream))))))]
+               (lazy-seq (let [byte-val (.read input-stream)]
+                           (when (not= byte-val -1)
+                             (cons byte-val (step input-stream))))))]
     (step is)))
 
 (defn bytes-to-int [bytes]
-  (reduce (fn [acc b] (+ (* acc 256) b)) 0 bytes))
+  (reduce (fn [acc b] (+ (* acc 256) b))
+          0
+          bytes))
 
 (defn -main [& args]
-  ;; You can use print statements as follows for debugging, they'll be visible when running tests.
+;; You can use print statements as follows for debugging, they'll be
+;; visible when running tests.
   (println "Logs from your program will appear here!")
-
-  ;; Uncomment this block to pass the first stage
-  ;; (let [command (second args)]
-  ;;   (case command
-  ;;     ".dbinfo"
-  ;;     (let [db-file-path (first args)
-  ;;           contents (lazy-byte-seq db-file-path)
-  ;;           page-size (bytes-to-int (take 2 (drop 16 contents)))]
-  ;;       (println (str "database page size: " page-size)))))
-  )
+;; Uncomment this block to pass the first stage
+;; (let [command (second args)]
+;;   (case command
+;;     ".dbinfo"
+;;     (let [db-file-path (first args)
+;;           contents (lazy-byte-seq db-file-path)
+;;           page-size (bytes-to-int (take 2 (drop 16 contents)))]
+;;       (println (str "database page size: " page-size)))))
+)

compiled_starters/clojure/your_program.sh

@@ -8,8 +8,17 @@
 
 set -e # Exit early if any commands fail
 
+# Copied from .codecrafters/compile.sh
+#
+# - Edit this to change how your program compiles locally
+# - Edit .codecrafters/compile.sh to change how your program compiles remotely
+(
+  cd "$(dirname "$0")" # Ensure compile steps are run within the repository directory
+  clj -T:build
+)
+
 # Copied from .codecrafters/run.sh
 #
 # - Edit this to change how your program runs locally
 # - Edit .codecrafters/run.sh to change how your program runs remotely
-bb -m sqlite.core "$@"
+exec java -jar /tmp/codecrafters-build-sqlite-clojure/target.jar "$@"

solutions/clojure/01-dr6/code/.codecrafters/compile.sh

@@ -7,3 +7,5 @@
 # Learn more: https://codecrafters.io/program-interface
 
 set -e # Exit on failure
+
+clj -T:build

solutions/clojure/01-dr6/code/.codecrafters/run.sh

@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-bb -m sqlite.core "$@"
+exec java -jar /tmp/codecrafters-build-sqlite-clojure/target.jar "$@"

solutions/clojure/01-dr6/code/build.clj

@@ -2,22 +2,20 @@
   (:gen-class)
   (:require [clojure.tools.build.api :as b]))
 
-(def lib 'io.codecrafters.http-server)
-(def class-dir "/tmp/codecrafters-build-http-server-clojure/classes")
+(def lib 'io.codecrafters.sqlite)
+(def class-dir "/tmp/codecrafters-build-sqlite-clojure/classes")
 (def basis (b/create-basis {:project "deps.edn"}))
-(def uber-file "/tmp/codecrafters-build-http-server-clojure/target.jar")
+(def uber-file "/tmp/codecrafters-build-sqlite-clojure/target.jar")
 
-(defn clean
-  [_]
-  (b/delete {:path "/tmp/codecrafters-build-http-server-clojure"}))
+(defn clean [_] (b/delete {:path "/tmp/codecrafters-build-sqlite-clojure"}))
 
 (defn uber
   [_]
   (clean nil)
   (b/copy-dir {:src-dirs ["src"], :target-dir class-dir})
   (b/compile-clj
-    {:basis basis, :ns-compile '[http-server.core], :class-dir class-dir})
+    {:basis basis, :ns-compile '[sqlite.core], :class-dir class-dir})
   (b/uber {:class-dir class-dir,
            :uber-file uber-file,
            :basis basis,
-           :main 'http-server.core}))
+           :main 'sqlite.core}))

solutions/clojure/01-dr6/code/src/sqlite/core.clj

@@ -1,26 +1,27 @@
 (ns sqlite.core
   (:gen-class)
-  (:require
-   [clojure.java.io :as io]))
+  (:require [clojure.java.io :as io]))
 
 (defn lazy-byte-seq [filepath]
   (let [is (io/input-stream filepath)
         step (fn step [input-stream]
-               (lazy-seq
-                (let [byte-val (.read input-stream)]
-                  (when (not= byte-val -1)
-                    (cons byte-val (step input-stream))))))]
+               (lazy-seq (let [byte-val (.read input-stream)]
+                           (when (not= byte-val -1)
+                             (cons byte-val (step input-stream))))))]
     (step is)))
 
 (defn bytes-to-int [bytes]
-  (reduce (fn [acc b] (+ (* acc 256) b)) 0 bytes))
+  (reduce (fn [acc b] (+ (* acc 256) b))
+          0
+          bytes))
 
 (defn -main [& args]
-  (let [command (second args)]
-    (case command
-      ".dbinfo"
-      (let [db-file-path (first args)
-            contents (lazy-byte-seq db-file-path)
-            page-size (bytes-to-int (take 2 (drop 16 contents)))]
-        (println (str "database page size: " page-size)))))
-  )
+  (println "Logs from your program will appear here!")
+(let [command (second args)]
+  (case command
+    ".dbinfo"
+    (let [db-file-path (first args)
+          contents (lazy-byte-seq db-file-path)
+          page-size (bytes-to-int (take 2 (drop 16 contents)))]
+      (println (str "database page size: " page-size)))))
+)

solutions/clojure/01-dr6/code/your_program.sh

@@ -8,8 +8,17 @@
 
 set -e # Exit early if any commands fail
 
+# Copied from .codecrafters/compile.sh
+#
+# - Edit this to change how your program compiles locally
+# - Edit .codecrafters/compile.sh to change how your program compiles remotely
+(
+  cd "$(dirname "$0")" # Ensure compile steps are run within the repository directory
+  clj -T:build
+)
+
 # Copied from .codecrafters/run.sh
 #
 # - Edit this to change how your program runs locally
 # - Edit .codecrafters/run.sh to change how your program runs remotely
-bb -m sqlite.core "$@"
+exec java -jar /tmp/codecrafters-build-sqlite-clojure/target.jar "$@"