From ca81233e70b2eb9659e9ded57a02e4cbf2889899 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Wed, 26 Oct 2016 15:44:47 -0700 Subject: [PATCH] Make Jetty a dynamic dependency. --- build.boot | 2 +- src/framework/one.clj | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.boot b/build.boot index 0b8e3c6..e2af2d9 100644 --- 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 index c9bff9d..8786d1f 100644 --- 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