From 85d69aab150f833a155ebd25eb0a025342833f97 Mon Sep 17 00:00:00 2001
From: Anghenev <vlad.anghene@gmail.com>
Date: Tue, 3 Dec 2019 22:48:36 +0200
Subject: [PATCH] updated to latest lib versions and java 11 dependency

---
 project.clj        | 18 ++++++++++--------
 run                |  1 +
 src-cljs/main.cljs |  8 ++++----
 src/main.clj       |  4 ++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/project.clj b/project.clj
index bb2c05b..9f19645 100644
--- a/project.clj
+++ b/project.clj
@@ -1,18 +1,20 @@
-(defproject org.httpkit/chat-websocket "1.0"
+(defproject chat "1.0"
   :description "Realtime chat by utilizing http-kit's websocket support"
-  :dependencies [[org.clojure/clojure "1.4.0"]
-                 [ring/ring-core "1.1.6"]
-                 [compojure "1.0.2"]
-                 [org.clojure/data.json "0.1.2"]
+  :dependencies [[org.clojure/clojure "1.10.1"]
+                 [org.clojure/clojurescript "1.10.597"]
+                 [ring/ring-core "1.8.0"]
+                 [ring/ring-defaults "0.3.2"]
+                 [compojure "1.6.1"]
+                 [org.clojure-android/data.json "0.2.6-SNAPSHOT"]
                  [org.clojure/tools.logging "0.2.3"]
                  [ch.qos.logback/logback-classic "1.0.1"]
-                 [http-kit "2.1.5"]]
+                 [http-kit "2.4.0-alpha4"]]
   :warn-on-reflection true
   :min-lein-version "2.0.0"
   :main main
   :test-paths ["test"]
-  :plugins [[lein-swank "1.4.4"]
-            [lein-cljsbuild "0.3.0"]]
+  :plugins [[lein-swank "1.4.5"]
+            [lein-cljsbuild "1.1.7"]]
   :cljsbuild {
               :builds [{:source-paths ["src-cljs"]
                         :compiler {:output-to "static/main.js"
diff --git a/run b/run
index a04de81..ce045eb 100755
--- a/run
+++ b/run
@@ -7,6 +7,7 @@ CP="classes:$(lein classpath):examples/websocket/"
 java -cp "$CP" \
     clojure.main -m main
 
+java -cp `lein classpath` clojure.main -e "(do (set! *warn-on-reflection* true) (require 'qbits.alia.async))"
 
 
     # -Xdebug -Xrunjdwp:transport=dt_socket,address=9092,server=y,suspend=n \
diff --git a/src-cljs/main.cljs b/src-cljs/main.cljs
index b859357..d850e41 100644
--- a/src-cljs/main.cljs
+++ b/src-cljs/main.cljs
@@ -3,7 +3,7 @@
 (def i (js/$ "#i"))
 (def history (js/$ "#history"))
 
-(defn- now [] 
+(defn- now []
   (quot (.getTime (js/Date.)) 1000))
 
 (def max-id (atom 0))
@@ -13,7 +13,7 @@
         author (str "<span class=\"author\">" (.-author msg) "</span>: ")]
     (.append history (str "<li>" author (.-msg msg) t "</li>"))))
 
-(def conn 
+(def conn
   (js/WebSocket. "ws://127.0.0.1:9899/ws"))
 
 (set! (.-onopen conn)
@@ -21,7 +21,7 @@
     (.send conn
       (.stringify js/JSON (js-obj "command" "getall")))))
 
-(set! (.-onerror conn) 
+(set! (.-onerror conn)
   (fn []
     (js/alert "error")
     (.log js/console js/arguments)))
@@ -45,6 +45,6 @@
 
 (.click (js/$ "#send") send-to-server)
 
-(.keyup (.focus i) 
+(.keyup (.focus i)
   (fn [e]
     (if (= (.-which e) 13) (send-to-server))))
diff --git a/src/main.clj b/src/main.clj
index fdaa852..343549c 100644
--- a/src/main.clj
+++ b/src/main.clj
@@ -4,9 +4,9 @@
         [ring.middleware.file-info :only [wrap-file-info]]
         [clojure.tools.logging :only [info]]
         [clojure.data.json :only [json-str read-json]]
+        [ring.middleware.defaults :refer :all]
         (compojure [core :only [defroutes GET POST]]
                    [route :only [files not-found]]
-                   [handler :only [site]]
                    [route :only [not-found]])))
 
 (defn- now [] (quot (System/currentTimeMillis) 1000))
@@ -60,5 +60,5 @@
       resp)))
 
 (defn -main [& args]
-  (run-server (-> #'chartrootm site wrap-request-logging) {:port 9899})
+  (run-server (-> #'chartrootm (wrap-defaults site-defaults) wrap-request-logging) {:port 9899})
   (info "server started. http://127.0.0.1:9899"))