From 05bb63f25480230ca3ba29a09dd974a664285b4a Mon Sep 17 00:00:00 2001 From: Dan Holmsand Date: Fri, 29 May 2015 10:50:23 +0200 Subject: [PATCH] Update React to 0.13.3-0, and more Newer ClojureScript, figwheel, Clojure, cljsbuild --- project.clj | 14 +++++++------- src/reagent/ratom.cljs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/project.clj b/project.clj index d0e74d4..00c5a32 100644 --- a/project.clj +++ b/project.clj @@ -3,11 +3,11 @@ :license {:name "MIT"} :description "A simple ClojureScript interface to React" - :dependencies [[org.clojure/clojure "1.6.0"] - [org.clojure/clojurescript "0.0-3126"] - [cljsjs/react "0.12.2-5"]] + :dependencies [[org.clojure/clojure "1.7.0-RC1"] + [org.clojure/clojurescript "0.0-3297"] + [cljsjs/react "0.13.3-0"]] - :plugins [[lein-cljsbuild "1.0.5"]] + :plugins [[lein-cljsbuild "1.0.6"]] :source-paths ["src"] @@ -15,8 +15,8 @@ {:builds {:client {:source-paths ["test"]}}}} :dev [:test - {:dependencies [[figwheel "0.2.5"]] - :plugins [[lein-figwheel "0.2.5"]] + {:dependencies [[figwheel "0.3.3"]] + :plugins [[lein-figwheel "0.3.3"]] :source-paths ["demo"] ;; for lighttable :resource-paths ["site" "outsite"] :figwheel {:css-dirs ["site/public/css"]} @@ -69,5 +69,5 @@ :compiler {:output-to "outsite/public/js/main.js"}}}} :figwheel {:http-server-root "public" ;; assumes "resources" - ;; broken in figwheel 0.2.5: :repl false + :repl false }) diff --git a/src/reagent/ratom.cljs b/src/reagent/ratom.cljs index 5993387..073f3cd 100644 --- a/src/reagent/ratom.cljs +++ b/src/reagent/ratom.cljs @@ -1,5 +1,5 @@ (ns reagent.ratom - (:refer-clojure :exclude [atom]) + (:refer-clojure :exclude [atom run!]) (:require-macros [reagent.debug :refer (dbg log warn dev?)]) (:require [reagent.impl.util :as util]))