From 10bb2416afcafa42fdcef95310fd8b15743fce13 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Thu, 2 May 2019 16:28:58 +0100 Subject: [PATCH] Ran lein ancient; updated most libraries Deliberately haven't updated Clojure to 1.10 With leaflet 2.0.1-0 selecting pins doesn't work - so haven't updated --- project.clj | 61 ++++++++++--------- .../youyesyet/canvasser_app/views/map.cljs | 2 +- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/project.clj b/project.clj index 5a15078..c41a55a 100644 --- a/project.clj +++ b/project.clj @@ -5,50 +5,51 @@ :url "https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"} :url "https://github.com/simon-brooke/youyesyet" - :dependencies [[adl-support "0.1.6-SNAPSHOT"] + :dependencies [[adl-support "0.1.6"] [bouncer "1.0.1"] [ch.qos.logback/logback-classic "1.2.3"] [clj-oauth "1.5.5"] [cljsjs/react-leaflet "1.6.5-0"] - [cljs-ajax "0.7.4"] + ;; [cljsjs/react-leaflet "2.0.1-0"] is available but doesn't seem to work fully + [cljs-ajax "0.8.0"] [com.andrewmcveigh/cljs-time "0.5.2"] [clojure.java-time "0.3.2"] [com.cemerick/url "0.1.1"] [compojure "1.6.1"] - [conman "0.8.2"] - [cprop "0.1.11"] + [conman "0.8.3"] + [cprop "0.1.13"] [day8.re-frame/http-fx "0.1.6"] [korma "0.4.3"] [lib-noir "0.9.9" :exclusions [org.clojure/tools.reader]] [luminus/ring-ttl-session "0.3.2"] - [luminus-nrepl "0.1.4"] - [luminus-migrations "0.5.2"] - [luminus-immutant "0.2.4"] - [markdown-clj "1.0.2"] + [luminus-nrepl "0.1.6"] + [luminus-migrations "0.6.5"] + [luminus-immutant "0.2.5"] + [markdown-clj "1.0.8"] [metosin/compojure-api "1.1.12"] - [metosin/ring-http-response "0.9.0"] - [migratus "1.0.8"] - [mount "0.1.12"] + [metosin/ring-http-response "0.9.1"] + [migratus "1.2.3"] + [mount "0.1.16"] [org.clojure/clojure "1.9.0"] - [org.clojure/clojurescript "1.10.339" :scope "provided"] + [org.clojure/clojurescript "1.10.520" :scope "provided"] [org.clojure/core.memoize "0.7.1"] ;;[org.clojure/spec.alpha "0.2.168"] - [org.clojure/tools.cli "0.3.7"] + [org.clojure/tools.cli "0.4.2"] [org.clojure/tools.logging "0.4.1"] - [org.postgresql/postgresql "42.2.4"] - [org.webjars/bootstrap "4.1.2"] - [org.webjars/font-awesome "5.1.0"] + [org.postgresql/postgresql "42.2.5"] + [org.webjars/bootstrap "4.3.1"] + [org.webjars/font-awesome "5.8.1"] [org.webjars.bower/tether "1.4.4"] [postgre-types "0.0.4"] - [re-frame "0.10.5"] + [re-frame "0.10.6"] [reagent "0.8.1"] - [reagent-utils "0.3.1"] - [ring-middleware-format "0.7.2"] + [reagent-utils "0.3.2"] + [ring-middleware-format "0.7.4"] [ring/ring-defaults "0.3.2"] - [ring/ring-servlet "1.6.3"] + [ring/ring-servlet "1.7.1"] [ring-webjars "0.2.0"] [secretary "1.2.3"] - [selmer "1.11.8"]] + [selmer "1.12.12"]] :deploy-repositories [["releases" :clojars] ["snapshots" :clojars]] @@ -63,7 +64,7 @@ :main ^:skip-aot youyesyet.core :migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")} - :plugins [[lein-adl "0.1.7-SNAPSHOT"] + :plugins [[lein-adl "0.1.7"] [lein-cljsbuild "1.1.7"] [lein-codox "0.10.7-multilang"] [lein-cprop "1.0.3"] @@ -147,21 +148,21 @@ :test [:project/dev :project/test :profiles/test] - :project/dev {:dependencies [[prone "1.1.4"] - [ring/ring-mock "0.3.2"] - [ring/ring-devel "1.6.3"] + :project/dev {:dependencies [[prone "1.6.3"] + [ring/ring-mock "0.4.0"] + [ring/ring-devel "1.7.1"] [org.webjars/webjars-locator-jboss-vfs "0.1.0"] - [luminus-immutant "0.2.4"] - [pjstadig/humane-test-output "0.8.3"] + [luminus-immutant "0.2.5"] + [pjstadig/humane-test-output "0.9.0"] [binaryage/devtools "0.9.10"] [com.cemerick/piggieback "0.2.2"] [directory-naming/naming-java "0.8"] - [doo "0.1.10"] - [figwheel-sidecar "0.5.16"]] + [doo "0.1.11"] + [figwheel-sidecar "0.5.18"]] :plugins [[com.jakemccrary/lein-test-refresh "0.23.0"] [lein-doo "0.1.10"] [lein-figwheel "0.5.16"] - [org.clojure/clojurescript "1.9.495"]] + [org.clojure/clojurescript "1.10.520"]] :cljsbuild {:builds {:app {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] diff --git a/src/cljs/youyesyet/canvasser_app/views/map.cljs b/src/cljs/youyesyet/canvasser_app/views/map.cljs index 432aad2..c917a8d 100644 --- a/src/cljs/youyesyet/canvasser_app/views/map.cljs +++ b/src/cljs/youyesyet/canvasser_app/views/map.cljs @@ -48,7 +48,7 @@ ;;; thought. ;; which provider to use -(def *map-provider* :osm) +(def ^dynamic *map-provider* :osm) (def osm-url "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png") (def osm-attrib "Map data © OpenStreetMap contributors")