[fix] [#359] Community appenders not included in jar

taoensso · Oct 29, 2022 · df3ea50 · df3ea50
1 parent 2aa575d
commit df3ea50
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -208,7 +208,7 @@ See also `car-appender/query-entries`.
 
 ### Community appenders
 
-A number of community appenders are included out-the-box [here](https://github.com/ptaoussanis/timbre/tree/master/community/src). These include appenders for Android, Logstash, Slack, Sentry, NodeJS, Syslog, PostgreSQL, etc.
+A number of community appenders are included out-the-box [here](https://github.com/ptaoussanis/timbre/tree/master/src/taoensso/timbre/appenders/community). These include appenders for Android, Logstash, Slack, Sentry, NodeJS, Syslog, PostgreSQL, etc.
 
 Thanks goes to the respective authors!  
 **Please see the relevant namespace docstring for details**.

diff --git a/extra/README.md b/extra/README.md
@@ -0,0 +1,5 @@
+This dir contains community code that requires a specific platform and/or environment.
+
+The code **should not** be included in the default Leiningen profile since it would cause problems for most users when running tests, generating docs, etc.
+
+The code **should** be included when generating final jar build for deployment to Clojars, etc.
diff --git a/community/src/android_logcat.clj → ...re/appenders/community/android_logcat.clj b/community/src/android_logcat.clj → ...re/appenders/community/android_logcat.clj
diff --git a/community/src/newrelic.clj → ...o/timbre/appenders/community/newrelic.clj b/community/src/newrelic.clj → ...o/timbre/appenders/community/newrelic.clj
diff --git a/community/src/zmq.clj → ...oensso/timbre/appenders/community/zmq.clj b/community/src/zmq.clj → ...oensso/timbre/appenders/community/zmq.clj
diff --git a/extra/test/taoensso/timbre/appenders/community/empty b/extra/test/taoensso/timbre/appenders/community/empty
@@ -0,0 +1 @@
+empty
diff --git a/project.clj b/project.clj
@@ -32,12 +32,10 @@
    :c1.9     {:dependencies [[org.clojure/clojure "1.9.0"]]}
 
    :depr     {:jvm-opts ["-Dtaoensso.elide-deprecated=true"]}
-   :dev      [:c1.11 :test :server-jvm #_:depr #_:community] ; TODO :depr
+   :dev      [:c1.11 :test :server-jvm #_:depr :community #_:extra] ; TODO :depr
 
    :community
-   {:source-paths [       "src"                  "community/src"]
-    :test-paths   ["test" "src" "community/test" "community/src"]
-    :dependencies
+   {:dependencies
     [[irclj                   "0.5.0-alpha4"]
      [org.graylog2/gelfclient "1.5.1"
       :exclusions [com.fasterxml.jackson.core/jackson-core]]
@@ -55,6 +53,10 @@
      [cljs-node-io            "1.1.2"] ; Node spit appender
      ]}
 
+   :extra
+   {:source-paths [         "src"                "extra/src"]
+    :test-paths   ["test" #_"src" "extra/test" #_"extra/src"]}
+
    :test
    {:dependencies
     [[org.clojure/test.check    "1.1.1"]
@@ -84,7 +86,9 @@
 
   :aliases
   {"start-dev"  ["with-profile" "+dev" "repl" ":headless"]
-   "deploy-lib" ["do" ["build-once"] ["deploy" "clojars"] ["install"]]
+   ;; "deploy-lib" ["do" ["build-once"] ["deploy" "clojars"] ["install"]]
+   "deploy-lib" ["with-profile" "+extra"
+                 "do" ["build-once"] ["deploy" "clojars"] ["install"]]
    "build-once" ["do" ["clean"] "cljsbuild" "once"]
 
    "test-cljs"  ["with-profile" "+test" "cljsbuild" "test"]

diff --git a/src/taoensso/timbre/appenders/community/android_logcat._clj b/src/taoensso/timbre/appenders/community/android_logcat._clj
@@ -0,0 +1 @@
+../../../../../extra/src/taoensso/timbre/appenders/community/android_logcat.clj
diff --git a/community/src/congomongo.clj → ...timbre/appenders/community/congomongo.clj b/community/src/congomongo.clj → ...timbre/appenders/community/congomongo.clj
diff --git a/community/src/franzy.clj → ...sso/timbre/appenders/community/franzy.clj b/community/src/franzy.clj → ...sso/timbre/appenders/community/franzy.clj
diff --git a/community/src/gelf.clj → ...ensso/timbre/appenders/community/gelf.clj b/community/src/gelf.clj → ...ensso/timbre/appenders/community/gelf.clj
diff --git a/community/src/irclj.clj → ...nsso/timbre/appenders/community/irclj.clj b/community/src/irclj.clj → ...nsso/timbre/appenders/community/irclj.clj
diff --git a/community/src/logstash.clj → ...o/timbre/appenders/community/logstash.clj b/community/src/logstash.clj → ...o/timbre/appenders/community/logstash.clj
diff --git a/src/taoensso/timbre/appenders/community/new_relic._clj b/src/taoensso/timbre/appenders/community/new_relic._clj
@@ -0,0 +1 @@
+../../../../../extra/src/taoensso/timbre/appenders/community/newrelic.clj
diff --git a/community/src/node_spit.cljs → ...timbre/appenders/community/node_spit.cljs b/community/src/node_spit.cljs → ...timbre/appenders/community/node_spit.cljs
diff --git a/community/src/postgresql.clj → ...timbre/appenders/community/postgresql.clj b/community/src/postgresql.clj → ...timbre/appenders/community/postgresql.clj
diff --git a/community/src/rolling.clj → ...so/timbre/appenders/community/rolling.clj b/community/src/rolling.clj → ...so/timbre/appenders/community/rolling.clj
diff --git a/community/src/rotor.clj → ...nsso/timbre/appenders/community/rotor.clj b/community/src/rotor.clj → ...nsso/timbre/appenders/community/rotor.clj
diff --git a/community/src/sentry.clj → ...sso/timbre/appenders/community/sentry.clj b/community/src/sentry.clj → ...sso/timbre/appenders/community/sentry.clj
diff --git a/community/src/server_socket.clj → ...bre/appenders/community/server_socket.clj b/community/src/server_socket.clj → ...bre/appenders/community/server_socket.clj
diff --git a/community/src/slack.clj → ...nsso/timbre/appenders/community/slack.clj b/community/src/slack.clj → ...nsso/timbre/appenders/community/slack.clj
diff --git a/community/src/syslog_appender.clj → ...e/appenders/community/syslog_appender.clj b/community/src/syslog_appender.clj → ...e/appenders/community/syslog_appender.clj
diff --git a/community/src/udp_socket.clj → ...timbre/appenders/community/udp_socket.clj b/community/src/udp_socket.clj → ...timbre/appenders/community/udp_socket.clj
diff --git a/src/taoensso/timbre/appenders/community/zmq._clj b/src/taoensso/timbre/appenders/community/zmq._clj
@@ -0,0 +1 @@
+../../../../../extra/src/taoensso/timbre/appenders/community/zmq.clj
diff --git a/...mbre/appenders/community/rolling_test.clj → ...mbre/appenders/community/rolling_test.clj b/...mbre/appenders/community/rolling_test.clj → ...mbre/appenders/community/rolling_test.clj
diff --git a/...timbre/appenders/community/rotor_test.clj → ...timbre/appenders/community/rotor_test.clj b/...timbre/appenders/community/rotor_test.clj → ...timbre/appenders/community/rotor_test.clj
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../../../extra/src/taoensso/timbre/appenders/community/android_logcat.clj