Merge pull request #311 from codecrafters-io/andy/upgrade

Upgrade Clojure to v1.12

Author: andy1li

compiled_starters/clojure/.codecrafters/compile.sh

@@ -8,5 +8,4 @@
 
 set -e # Exit on failure
 
-lein deps
-lein uberjar
+clj -T:build

compiled_starters/clojure/.codecrafters/run.sh

@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec java -jar /tmp/codecrafters-redis-target/uberjar/redis-0.1.0-SNAPSHOT-standalone.jar "$@"
+exec java -jar /tmp/codecrafters-build-redis-clojure/target.jar "$@"

compiled_starters/clojure/README.md

@@ -26,7 +26,7 @@ That's all!
 
 Note: This section is for stages 2 and beyond.
 
-1. Ensure you have `lein` installed locally
+1. Ensure you have `clj` installed locally
 1. Run `./your_program.sh` to run your Redis server, which is implemented in
    `src/redis/core.clj`.
 1. Commit your changes and run `git push origin master` to submit your solution

compiled_starters/clojure/build.clj

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

compiled_starters/clojure/codecrafters.yml

@@ -7,5 +7,5 @@ debug: false
 # Use this to change the Clojure version used to run your code
 # on Codecrafters.
 #
-# Available versions: clojure-1.11.3
-language_pack: clojure-1.11.3
+# Available versions: clojure-1.12.0
+language_pack: clojure-1.12.0

compiled_starters/clojure/deps.edn

@@ -0,0 +1,16 @@
+{
+  :paths ["src"]
+
+  :deps {
+    org.clojure/clojure {:mvn/version "1.12.0"}
+    org.clojure/tools.cli {:mvn/version "1.1.230"}
+    aleph/aleph {:mvn/version "0.8.3"}
+  }
+
+  :aliases {
+    :build {
+      :extra-deps {io.github.clojure/tools.build {:mvn/version "0.10.9"}}
+      :exec-fn build/uber
+    }
+  }
+}

compiled_starters/clojure/project.clj

@@ -14,12 +14,11 @@ set -e # Exit early if any commands fail
 # - Edit .codecrafters/compile.sh to change how your program compiles remotely
 (
   cd "$(dirname "$0")" # Ensure compile steps are run within the repository directory
-  lein deps
-  lein uberjar
+  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
-exec java -jar /tmp/codecrafters-redis-target/uberjar/redis-0.1.0-SNAPSHOT-standalone.jar "$@"
+exec java -jar /tmp/codecrafters-build-redis-clojure/target.jar "$@"

compiled_starters/clojure/your_program.sh

@@ -0,0 +1,13 @@
+# syntax=docker/dockerfile:1.7-labs
+FROM clojure:tools-deps-bookworm
+
+# Ensures the container is re-built if dependency files change
+ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="deps.edn"
+
+WORKDIR /app
+
+# .git & README.md are unique per-repository. We ignore them on first copy to prevent cache misses
+COPY --exclude=.git --exclude=README.md . /app
+
+# Install language-specific dependencies
+RUN .codecrafters/compile.sh

dockerfiles/clojure-1.12.0.Dockerfile

@@ -8,5 +8,4 @@
 
 set -e # Exit on failure
 
-lein deps
-lein uberjar
+clj -T:build

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

@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec java -jar /tmp/codecrafters-redis-target/uberjar/redis-0.1.0-SNAPSHOT-standalone.jar "$@"
+exec java -jar /tmp/codecrafters-build-redis-clojure/target.jar "$@"

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

@@ -26,7 +26,7 @@ That's all!
 
 Note: This section is for stages 2 and beyond.
 
-1. Ensure you have `lein` installed locally
+1. Ensure you have `clj` installed locally
 1. Run `./your_program.sh` to run your Redis server, which is implemented in
    `src/redis/core.clj`.
 1. Commit your changes and run `git push origin master` to submit your solution

solutions/clojure/01-jm1/code/README.md

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

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

@@ -7,5 +7,5 @@ debug: false
 # Use this to change the Clojure version used to run your code
 # on Codecrafters.
 #
-# Available versions: clojure-1.11.3
-language_pack: clojure-1.11.3
+# Available versions: clojure-1.12.0
+language_pack: clojure-1.12.0

solutions/clojure/01-jm1/code/codecrafters.yml

@@ -0,0 +1,16 @@
+{
+  :paths ["src"]
+
+  :deps {
+    org.clojure/clojure {:mvn/version "1.12.0"}
+    org.clojure/tools.cli {:mvn/version "1.1.230"}
+    aleph/aleph {:mvn/version "0.8.3"}
+  }
+
+  :aliases {
+    :build {
+      :extra-deps {io.github.clojure/tools.build {:mvn/version "0.10.9"}}
+      :exec-fn build/uber
+    }
+  }
+}

solutions/clojure/01-jm1/code/deps.edn

@@ -14,12 +14,11 @@ set -e # Exit early if any commands fail
 # - Edit .codecrafters/compile.sh to change how your program compiles remotely
 (
   cd "$(dirname "$0")" # Ensure compile steps are run within the repository directory
-  lein deps
-  lein uberjar
+  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
-exec java -jar /tmp/codecrafters-redis-target/uberjar/redis-0.1.0-SNAPSHOT-standalone.jar "$@"
+exec java -jar /tmp/codecrafters-build-redis-clojure/target.jar "$@"

solutions/clojure/01-jm1/code/project.clj

@@ -8,5 +8,4 @@
 
 set -e # Exit on failure
 
-lein deps
-lein uberjar
+clj -T:build

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

@@ -8,4 +8,4 @@
 
 set -e # Exit on failure
 
-exec java -jar /tmp/codecrafters-redis-target/uberjar/redis-0.1.0-SNAPSHOT-standalone.jar "$@"
+exec java -jar /tmp/codecrafters-build-redis-clojure/target.jar "$@"

starter_templates/clojure/code/.codecrafters/compile.sh

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

starter_templates/clojure/code/.codecrafters/run.sh

@@ -0,0 +1,16 @@
+{
+  :paths ["src"]
+
+  :deps {
+    org.clojure/clojure {:mvn/version "1.12.0"}
+    org.clojure/tools.cli {:mvn/version "1.1.230"}
+    aleph/aleph {:mvn/version "0.8.3"}
+  }
+
+  :aliases {
+    :build {
+      :extra-deps {io.github.clojure/tools.build {:mvn/version "0.10.9"}}
+      :exec-fn build/uber
+    }
+  }
+}

starter_templates/clojure/code/build.clj

@@ -1,3 +1,3 @@
 attributes:
-  required_executable: lein
+  required_executable: clj
   user_editable_file: src/redis/core.clj