From 458de5f21dd30cf6773dec7a687801e682f01f4c Mon Sep 17 00:00:00 2001 From: Teemu Patja Date: Thu, 16 Mar 2017 20:49:54 +0200 Subject: [PATCH] Update dependencies, fix cljsbuild warning --- project.clj | 32 +++++++++++++++++--------------- src/cljs/commiteth/handlers.cljs | 13 +++++++++++-- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/project.clj b/project.clj index f2e9720..5a200c6 100644 --- a/project.clj +++ b/project.clj @@ -1,24 +1,26 @@ (defproject commiteth "0.1.0-SNAPSHOT" :description "Ethereum bounty bot for Github" :url "https://commiteth.com" - :dependencies [[metosin/compojure-api "1.1.10"] - [re-frame "0.9.1"] + :dependencies [[metosin/compojure-api "1.1.10" + :exclusions [joda-time]] + [re-frame "0.9.2"] [cljs-ajax "0.5.8"] [secretary "1.2.3"] - [reagent-utils "0.2.0"] - [reagent "0.6.0"] - [org.clojure/clojurescript "1.9.473"] + [reagent-utils "0.2.1"] + [reagent "0.6.1"] + [org.clojure/clojurescript "1.9.495"] [org.clojure/clojure "1.8.0"] - [selmer "1.10.5"] - [markdown-clj "0.9.93"] + [selmer "1.10.6"] + [markdown-clj "0.9.98"] [ring-middleware-format "0.7.2"] - [metosin/ring-http-response "0.8.1"] - [bouncer "1.0.0"] + [metosin/ring-http-response "0.8.2"] + [bouncer "1.0.1" + :exclusions [joda-time]] [org.clojure/tools.logging "0.3.1"] [compojure "1.5.2"] [http-kit "2.2.0"] [ring/ring-json "0.4.0"] - [ring/ring-defaults "0.2.2"] + [ring/ring-defaults "0.2.3"] [ring/ring-codec "1.0.1"] [mount "0.1.11"] [cprop "0.1.10"] @@ -26,9 +28,9 @@ [luminus-nrepl "0.1.4"] [buddy "1.3.0"] [buddy/buddy-auth "1.4.1"] - [luminus-migrations "0.2.9"] + [luminus-migrations "0.3.0"] [conman "0.6.3"] - [org.postgresql/postgresql "9.4.1212"] + [org.postgresql/postgresql "42.0.0"] [luminus-immutant "0.2.3"] [clj.qrgen "0.4.0"] [digest "1.4.5"] @@ -40,11 +42,11 @@ [cheshire "5.7.0"] [mpg "1.3.0"] [pandect "0.6.1"] - [prismatic/plumbing "0.5.3"] [cljsjs/moment "2.17.1-0"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.1"] - [jarohen/chime "0.2.0"]] + [jarohen/chime "0.2.0"] + [com.andrewmcveigh/cljs-time "0.4.0"]] :min-lein-version "2.0.0" :source-paths ["src/clj" "src/cljc"] @@ -108,7 +110,7 @@ [ring/ring-devel "1.5.1"] [pjstadig/humane-test-output "0.8.1"] [doo "0.1.7"] - [binaryage/devtools "0.9.0"] + [binaryage/devtools "0.9.2"] [figwheel-sidecar "0.5.9"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.1"] diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs index c83ff21..041309e 100644 --- a/src/cljs/commiteth/handlers.cljs +++ b/src/cljs/commiteth/handlers.cljs @@ -2,8 +2,7 @@ (:require [commiteth.db :as db] [re-frame.core :refer [dispatch reg-event-db reg-event-fx reg-fx]] [ajax.core :refer [GET POST]] - [cuerdas.core :as str] - [plumbing.core :refer [dissoc-in]])) + [cuerdas.core :as str])) (reg-fx :http @@ -276,6 +275,16 @@ :error (str "Failed to send transaction" e)]]}))))) +;; copied from plumbing.core to avoid cljsbuild warnings +(defn dissoc-in + [m [k & ks]] + (when m + (if-let [res (and ks (dissoc-in (get m k) ks))] + (assoc m k res) + (let [res (dissoc m k)] + (when-not (empty? res) + res))))) + (reg-event-fx :payout-confirmed (fn [{:keys [db]} [_ issue-id]]