Make Jetty a dynamic dependency.

framework-one · Oct 26, 2016 · ca81233 · ca81233
1 parent 0027e81
commit ca81233
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/build.boot b/build.boot
@@ -1,5 +1,5 @@
 (def project 'framework-one)
-(def version "0.8.1")
+(def version "0.8.2")
 
 (task-options!
  pom {:project     project

diff --git a/src/framework/one.clj b/src/framework/one.clj
@@ -21,7 +21,6 @@
             [compojure.coercions :refer :all]
             [compojure.core :refer :all]
             [compojure.route :as route]
-            [ring.adapter.jetty :as jetty]
             [ring.middleware.defaults :as ring-md]
             [selmer.filters]
             [selmer.parser]
@@ -516,10 +515,12 @@
     (if (:http-server this)
       this
       (let [start-server (case (:server this)
-                           :jetty    jetty/run-jetty
+                           :jetty    (do
+                                       (require '[ring.adapter.jetty :as jetty])
+                                       (resolve 'jetty/run-jetty))
                            :http-kit (do
                                        (require '[org.httpkit.server :as kit])
-                                       (resolve (symbol "kit/run-server")))
+                                       (resolve 'kit/run-server))
                            (throw (ex-info "Unsupported web server"
                                            {:server (:server this)})))]
         (assoc this