Move to deps.edn

Author: tomekw

.dir-locals.el

@@ -0,0 +1 @@
+((clojure-mode . ((cider-clojure-cli-aliases . ":dev"))))

.github/workflows/clojure.yml

@@ -1,40 +1,40 @@
 name: Clojure CI
-
 on:
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
-
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6.0.1
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5.1.0
       with:
         java-version: '11'
         distribution: 'temurin'
 
-    - name: Install Leiningen
-      uses: DeLaGuardo/setup-clojure@12.5
+    - name: Install Clojure CLI
+      uses: DeLaGuardo/setup-clojure@13.4
       with:
-        lein: latest
+        cli: latest
 
     - name: Cache dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5.0.1
       with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-lein-${{ hashFiles('**/project.clj') }}
+        path: |
+          ~/.m2/repository
+          ~/.gitlibs
+          ~/.deps.clj
+        key: ${{ runner.os }}-deps-${{ hashFiles('**/deps.edn') }}
         restore-keys: |
-          ${{ runner.os }}-lein-
+          ${{ runner.os }}-deps-
 
     - name: Install dependencies
-      run: lein deps
+      run: clojure -P -M:dev:test
 
     - name: Run tests
-      run: lein test
+      run: clojure -M:dev:test

.gitignore

@@ -14,3 +14,4 @@ pom.xml.asc
 .lsp/
 .clj-kondo/
 .eastwood
+.cpcache/

build.clj

@@ -0,0 +1,39 @@
+(ns build
+  (:require [clojure.tools.build.api :as b]
+            [deps-deploy.deps-deploy :as dd]))
+
+(def lib 'hikari-cp/hikari-cp)
+(def version "3.3.0")
+(def class-dir "target/classes")
+(def basis (b/create-basis {:project "deps.edn"}))
+(def jar-file (format "target/%s-%s.jar" (name lib) version))
+
+(defn clean [_]
+  (b/delete {:path "target"}))
+
+(defn jar [_]
+  (clean nil)
+  (b/write-pom {:class-dir class-dir
+                :lib lib
+                :version version
+                :basis basis
+                :src-dirs ["src"]
+                :scm {:url "https://github.com/tomekw/hikari-cp"
+                      :connection "scm:git:git://github.com/tomekw/hikari-cp.git"
+                      :developerConnection "scm:git:ssh://git@github.com/tomekw/hikari-cp.git"
+                      :tag (str "v" version)}
+                :pom-data [[:description "A Clojure wrapper to HikariCP JDBC connection pool"]
+                           [:url "https://github.com/tomekw/hikari-cp"]
+                           [:licenses
+                            [:license
+                             [:name "Eclipse Public License"]
+                             [:url "http://www.eclipse.org/legal/epl-v10.html"]]]]})
+  (b/copy-dir {:src-dirs ["src" "resources"]
+               :target-dir class-dir})
+  (b/jar {:class-dir class-dir
+          :jar-file jar-file}))
+
+(defn deploy [_]
+  (dd/deploy {:installer :remote
+              :artifact jar-file
+              :pom-file (b/pom-path {:lib lib :class-dir class-dir})}))

deps.edn

@@ -0,0 +1,37 @@
+{:paths ["src"]
+
+ :deps {org.clojure/clojure {:mvn/version "1.12.4"}
+        org.tobereplaced/lettercase {:mvn/version "1.0.0"}
+        com.zaxxer/HikariCP {:mvn/version "7.0.2"}}
+
+ :aliases
+ {:dev
+  {:extra-paths ["test" "dev"]
+   :extra-deps {org.slf4j/slf4j-nop {:mvn/version "2.0.17"}
+                org.clojure/java.jdbc {:mvn/version "0.7.12"}
+                com.h2database/h2 {:mvn/version "2.4.240"}
+                com.mysql/mysql-connector-j {:mvn/version "9.5.0"}
+                org.neo4j.driver/neo4j-java-driver {:mvn/version "6.0.2"}
+                org.postgresql/postgresql {:mvn/version "42.7.8"}
+                io.dropwizard.metrics/metrics-core {:mvn/version "4.2.37"}
+                io.dropwizard.metrics/metrics-healthchecks {:mvn/version "4.2.37"}
+                io.prometheus/simpleclient {:mvn/version "0.16.0"}}}
+
+  :test
+  {:extra-paths ["test"]
+   :extra-deps {io.github.cognitect-labs/test-runner
+                {:git/tag "v0.5.1" :git/sha "dfb30dd"}}
+   :main-opts ["-m" "cognitect.test-runner"]}
+
+  :eastwood
+  {:extra-deps {jonase/eastwood {:mvn/version "1.4.3"}}
+   :main-opts ["-m" "eastwood.lint" "{:source-paths [\"src\"]}"]}
+
+  :ancient
+  {:extra-deps {com.github.liquidz/antq {:mvn/version "2.11.1276"}}
+   :main-opts ["-m" "antq.core"]}
+
+  :build
+  {:deps {io.github.clojure/tools.build {:mvn/version "0.10.11"}
+          slipset/deps-deploy {:mvn/version "0.2.2"}}
+   :ns-default build}}}

project.clj

@@ -2,7 +2,7 @@
   (:require [clojure.test :refer :all]
             [hikari-cp.core :refer :all])
   (:import (com.zaxxer.hikari.pool HikariPool$PoolInitializationException)
-           (com.zaxxer.hikari HikariConfig HikariDataSource)
+           (com.zaxxer.hikari HikariConfig)
            (com.codahale.metrics MetricRegistry)
            (com.codahale.metrics.health HealthCheckRegistry)
            (com.zaxxer.hikari.metrics.prometheus PrometheusMetricsTrackerFactory)))