From 3d5af259b38e4cb5c62af6cf54d7ccd2b711fa02 Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Thu, 29 Feb 2024 14:15:00 +0100 Subject: [PATCH] Update project template Sync project boilerplate used across Taoensso libraries to help keep things easier to maintain. Changes: - Fix Graal build issue - Remove unnecessary Lein composite profile (fixes deprecation warning) - Update GitHub action dependencies (fixed deprecation warning) --- bb/graal_tests.clj | 4 +++- project.clj | 50 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/bb/graal_tests.clj b/bb/graal_tests.clj index b8c00d6..3397ebe 100755 --- 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 index 451f9ba..a2ea451 100644 --- a/project.clj +++ b/project.clj @@ -1,7 +1,7 @@ (defproject com.taoensso/faraday "1.12.1-SNAPSHOT" :author "Peter Taoussanis " :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,6 +15,8 @@ [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"]]} @@ -22,38 +24,36 @@ :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"]