Merge pull request #168 from taoensso/2024-02-29-ptaoussanis-update-t…

…emplate [General maintenance] Update project template
taoensso · Mar 6, 2024 · 53d1e0c · 53d1e0c
2 parents 0de2499 + d2626bb
commit 53d1e0c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 33 deletions.
diff --git a/.github/workflows/graal-tests.yml b/.github/workflows/graal-tests.yml
@@ -10,20 +10,20 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
           version: 'latest'
           java-version: ${{ matrix.java }}
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: DeLaGuardo/setup-clojure@10.0
+      - uses: DeLaGuardo/setup-clojure@12.5
         with:
           lein: latest
           bb: latest
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: deps-${{ hashFiles('deps.edn') }}

diff --git a/.github/workflows/main-tests.yml b/.github/workflows/main-tests.yml
@@ -10,17 +10,17 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
 
-      - uses: DeLaGuardo/setup-clojure@10.0
+      - uses: DeLaGuardo/setup-clojure@12.5
         with:
           lein: latest
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache-deps
         with:
           path: ~/.m2/repository

diff --git a/bb/graal_tests.clj b/bb/graal_tests.clj
@@ -28,7 +28,9 @@
   (let [graalvm-home (System/getenv "GRAALVM_HOME")
         bin-dir (str (fs/file graalvm-home "bin"))]
     (shell (executable bin-dir "gu") "install" "native-image")
-    (shell (executable bin-dir "native-image") "-jar" "target/graal-tests.jar" "--no-fallback" "graal_tests")))
+    (shell (executable bin-dir "native-image")
+      "--features=clj_easy.graal_build_time.InitClojureClasses"
+      "--no-fallback" "-jar" "target/graal-tests.jar" "graal_tests")))
 
 (defn run-tests []
   (let [{:keys [out]} (shell {:out :string} (executable "." "graal_tests"))]

diff --git a/project.clj b/project.clj
@@ -1,7 +1,7 @@
 (defproject com.taoensso/faraday "1.12.1-SNAPSHOT"
   :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Amazon DynamoDB client for Clojure"
-  :url "https://github.com/taoensso/faraday"
+  :url "https://www.taoensso.com/faraday"
 
   :license
   {:name "Eclipse Public License - v 1.0"
@@ -15,45 +15,45 @@
    [com.amazonaws/aws-java-sdk-dynamodb "1.12.581"
     :exclusions [joda-time commons-logging]]]
 
+  :test-paths ["test" #_"src"]
+
   :profiles
   {;; :default [:base :system :user :provided :dev]
    :provided {:dependencies [[org.clojure/clojure "1.11.1"]]}
    :c1.11    {:dependencies [[org.clojure/clojure "1.11.1"]]}
    :c1.10    {:dependencies [[org.clojure/clojure "1.10.3"]]}
    :c1.9     {:dependencies [[org.clojure/clojure "1.9.0"]]}
 
-   :test
-   {:jvm-opts ["-Dtaoensso.elide-deprecated=true"]
-    :global-vars
-    {*warn-on-reflection* true
-     *assert*             true
-     *unchecked-math*     false #_:warn-on-boxed}}
-
    :graal-tests
-   {:dependencies [[org.clojure/clojure "1.11.1"]
-                   [com.github.clj-easy/graal-build-time "0.1.4"]]
+   {:source-paths ["test"]
     :main taoensso.graal-tests
     :aot [taoensso.graal-tests]
-    :uberjar-name "graal-tests.jar"}
+    :uberjar-name "graal-tests.jar"
+    :dependencies
+    [[org.clojure/clojure                  "1.11.1"]
+     [com.github.clj-easy/graal-build-time "1.0.5"]]}
 
    :dev
-   [:c1.11 :test
-    {:jvm-opts ["-server"]
-     :dependencies
-     [[org.testcontainers/testcontainers "1.19.1"
-       :exclusions [com.fasterxml.jackson.core/jackson-annotations]]
-      [org.slf4j/slf4j-simple "1.7.36"]]
+   {:jvm-opts ["-server" "-Dtaoensso.elide-deprecated=true"]
 
-     :plugins
-     [[lein-pprint  "1.3.2"]
-      [lein-ancient "0.7.0"]
-      [com.taoensso.forks/lein-codox "0.10.10"]]
+    :global-vars
+    {*warn-on-reflection* true
+     *assert*             true
+     *unchecked-math*     false #_:warn-on-boxed}
 
-     :codox
-     {:language #{:clojure #_:clojurescript}
-      :base-language :clojure}}]}
+    :dependencies
+    [[org.testcontainers/testcontainers "1.19.1"
+      :exclusions [com.fasterxml.jackson.core/jackson-annotations]]
+     [org.slf4j/slf4j-simple "1.7.36"]]
 
-  :test-paths ["test" #_"src"]
+    :plugins
+    [[lein-pprint  "1.3.2"]
+     [lein-ancient "0.7.0"]
+     [com.taoensso.forks/lein-codox "0.10.11"]]
+
+    :codox
+    {:language #{:clojure #_:clojurescript}
+     :base-language :clojure}}}
 
   :aliases
   {"start-dev"     ["with-profile" "+dev" "repl" ":headless"]