From 6eb6599d3b0d6100be421e24a3ab698c696ee639 Mon Sep 17 00:00:00 2001 From: MelKori Date: Thu, 17 Aug 2023 14:13:17 +0300 Subject: [PATCH] be able to deal with different verisions of the upstream library --- profiles.clj | 18 ++++++++++++++++++ project.clj | 45 ++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 profiles.clj diff --git a/profiles.clj b/profiles.clj new file mode 100644 index 0000000..c36a8a4 --- /dev/null +++ b/profiles.clj @@ -0,0 +1,18 @@ +{:dev {:global-vars {*assert* true} + :dependencies [[ch.qos.logback/logback-classic "1.4.11" + :exclusions [org.slf4j/slf4j-api]] + [org.slf4j/jul-to-slf4j "2.0.7"] + [org.slf4j/jcl-over-slf4j "2.0.7"] + [org.slf4j/log4j-over-slf4j "2.0.7"] + [org.clojure/tools.logging "1.2.4"]] + #_#_:junit ["src-java"]} + + :lib-2.1.6 {:managed-dependencies ^:replace + [[org.umlg/sqlg-postgres-dialect "2.1.6"] + [org.umlg/sqlg-hsqldb-dialect "2.1.6"] + [org.umlg/sqlg-h2-dialect "2.1.6"] + [org.umlg/sqlg-mariadb-dialect "2.1.6"] + [org.umlg/sqlg-mysql-dialect "2.1.6"] + [org.umlg/sqlg-mssqlserver-dialect "2.1.6"] + [org.umlg/sqlg-c3p0 "2.1.6"]]} + :uberjar {:aot :all}} \ No newline at end of file diff --git a/project.clj b/project.clj index 32c4b8f..51ea73f 100644 --- a/project.clj +++ b/project.clj @@ -1,39 +1,34 @@ -(defproject ai.z7/sqlg-clj "0.0.8" +(defproject ai.z7/sqlg-clj "0.0.9" :description "The SQL Graph with Tinkerpop3 and Clojure" :url "https://github.com/fern-flower-lab/sqlg-clj" :license {:name "MIT"} + + :managed-dependencies [[org.umlg/sqlg-postgres-dialect "3.0.1"] + [org.umlg/sqlg-hsqldb-dialect "3.0.1"] + [org.umlg/sqlg-h2-dialect "3.0.1"] + [org.umlg/sqlg-mariadb-dialect "3.0.1"] + [org.umlg/sqlg-mysql-dialect "3.0.1"] + [org.umlg/sqlg-mssqlserver-dialect "3.0.1"] + [org.umlg/sqlg-c3p0 "3.0.1"]] + :dependencies [[org.clojure/clojure "1.11.1"] [potemkin "0.4.6"] [org.apache.commons/commons-configuration2 "2.9.0"] [com.google.guava/guava "31.1-jre"] [ai.z7/java-properties "1.2.1"] - [org.umlg/sqlg-postgres-dialect "3.0.1" - :exclusions [com.google.guava/guava]] - [org.umlg/sqlg-hsqldb-dialect "3.0.1" - :exclusions [com.google.guava/guava]] - [org.umlg/sqlg-h2-dialect "3.0.1" - :exclusions [com.google.guava/guava]] - [org.umlg/sqlg-mariadb-dialect "3.0.1" - :exclusions [com.google.guava/guava]] - [org.umlg/sqlg-mysql-dialect "3.0.1" - :exclusions [mysql/mysql-connector-java - com.google.guava/guava]] - [org.umlg/sqlg-mssqlserver-dialect "3.0.1" - :exclusions [com.google.guava/guava]] - [org.umlg/sqlg-c3p0 "3.0.1" - :exclusions [com.google.guava/guava]]] + ;; upstream version of the SqlG library + [org.umlg/sqlg-postgres-dialect :exclusions [com.google.guava/guava]] + [org.umlg/sqlg-hsqldb-dialect :exclusions [com.google.guava/guava]] + [org.umlg/sqlg-h2-dialect :exclusions [com.google.guava/guava]] + [org.umlg/sqlg-mariadb-dialect :exclusions [com.google.guava/guava]] + [org.umlg/sqlg-mysql-dialect :exclusions [mysql/mysql-connector-java + com.google.guava/guava]] + [org.umlg/sqlg-mssqlserver-dialect :exclusions [com.google.guava/guava]] + [org.umlg/sqlg-c3p0 :exclusions [com.google.guava/guava]]] + :source-paths ["src-clj"] #_#_:java-source-paths ["src-java"] - :profiles {:dev {:global-vars {*assert* true} - :dependencies [[ch.qos.logback/logback-classic "1.4.11" - :exclusions [org.slf4j/slf4j-api]] - [org.slf4j/jul-to-slf4j "2.0.7"] - [org.slf4j/jcl-over-slf4j "2.0.7"] - [org.slf4j/log4j-over-slf4j "2.0.7"] - [org.clojure/tools.logging "1.2.4"]] - #_#_:junit ["src-java"]} - :uberjar {:aot :all}} :provided {:javac-options []} :plugins [[lein-junit "1.1.9"]] :global-vars {*warn-on-reflection* true