Release 0.1.18

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJacM5lAAoJEKbk3FKDtdzsXooH/RTiHLdTjf2iYGdEO5jyTpYS
 uuMCEfLo9IQI7Na9Rcm2MHOUC64vcH1CnsLXKr8AZ6JtjzNamGyjLg09TvrauWAY
 w+qmWSWhN5rxL4x0echCUjxoeuwadBL3SuzI2vH8IjWKP6vAJqTuJAOCIrdEjiSN
 D1Em9PjgDsKuv9yFxkFbIF0bVKcidxe+mfiFgtIu6ZCzR0gcwJ01nBqyhFzkzm7e
 jjBIvHKptq+dixHJY9/GJk4v/8gf8t5Ap+Qy+HrPJcuhyS6SVPfjbepZtbtgZ7eY
 R2MJEljRx2DtqFpKdto90Ss8hEe+TU0Uq510XynnL38dyxpQKn5/MMrcRWlb1uY=
 =s6HF
 -----END PGP SIGNATURE-----

Merge tag '0.1.18' into react-16

Release 0.1.18

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This change
 
 ## Unreleased
 
+## [0.1.18] - 2018-01-31
+
+#### Fixed
+
+* Garden source dependencies are now working if you don't have your own dependency on Garden.
 
 
 ## [0.1.17] - 2018-01-31

project.clj

@@ -1,4 +1,4 @@
-(defproject day8.re-frame/trace "0.1.17-react16"
+(defproject day8.re-frame/trace "0.1.18-react16"
   :description "Tracing and developer tools for re-frame apps"
   :url "https://github.com/Day8/re-frame-trace"
   :license {:name "MIT"}
@@ -7,7 +7,9 @@
                  [reagent "0.8.0-alpha2" :scope "provided"]
                  [re-frame "0.10.3" :scope "provided"]
                  [binaryage/devtools "0.9.4"]
-                 [cljsjs/react-flip-move "2.9.17-0"]]
+                 [cljsjs/react-flip-move "2.9.17-0"]
+                 [com.yahoo.platform.yui/yuicompressor "2.4.8" :exclusions [rhino/js]]
+                 ]
   :plugins [[thomasa/mranderson "0.4.7"]
             [lein-less "RELEASE"]]
   :deploy-repositories {"releases"  :clojars

src/mranderson047/garden/v1v3v3/garden/def.clj

@@ -2,8 +2,8 @@
   (:require [mranderson047.garden.v1v3v3.garden.types]
             [mranderson047.garden.v1v3v3.garden.util :as util]
             [mranderson047.garden.v1v3v3.garden.core])
-  (:import garden.types.CSSFunction
-           garden.types.CSSAtRule))
+  (:import mranderson047.garden.v1v3v3.garden.types.CSSFunction
+           mranderson047.garden.v1v3v3.garden.types.CSSAtRule))
 
 (defmacro defstyles
   "Convenience macro equivalent to `(def name (list styles*))`."
@@ -60,7 +60,7 @@
       ;; => #garden.types.CSSFunction{:function \"url\", :args \"http://fonts.googleapis.com/css?family=Lato\"}
 
       (css (url \"http://fonts.googleapis.com/css?family=Lato\"))
-      ;; => url(http://fonts.googleapis.com/css?family=Lato) 
+      ;; => url(http://fonts.googleapis.com/css?family=Lato)
 
   Ex.
       (defcssfn attr
@@ -77,7 +77,7 @@
       (css (attr :vertical :length))
       ;; => \"attr(vertical length)\"
 
-      (attr :end-of-quote :string :inherit) 
+      (attr :end-of-quote :string :inherit)
       ;; => #garden.types.CSSFunction{:function \"url\", :args [:end-of-quote [:string :inherit]]}
 
       (css (attr :end-of-quote :string :inherit))
@@ -97,7 +97,7 @@
 (defmacro defkeyframes
   "Define a CSS @keyframes animation.
 
-  Ex. 
+  Ex.
       (defkeyframes my-animation
         [:from
          {:background \"red\"}]

src/mranderson047/garden/v1v3v3/garden/stylesheet.cljc

@@ -4,8 +4,8 @@
             [mranderson047.garden.v1v3v3.garden.color :as color]
             [mranderson047.garden.v1v3v3.garden.types :as t])
   #?(:clj
-      (:import garden.types.CSSFunction
-               garden.types.CSSAtRule)))
+      (:import mranderson047.garden.v1v3v3.garden.types.CSSFunction
+               mranderson047.garden.v1v3v3.garden.types.CSSAtRule)))
 
 ;;;; ## Stylesheet helpers
 

src/mranderson047/garden/v1v3v3/garden/util.cljc

@@ -9,7 +9,7 @@
   #?(:clj
      (:refer-clojure :exclude [format]))
   #?(:clj
-     (:import garden.types.CSSAtRule)))
+     (:import mranderson047.garden.v1v3v3.garden.types.CSSAtRule)))
 
 ;; ---------------------------------------------------------------------
 ;; String utilities
@@ -129,7 +129,7 @@
   [p s]
   (let [p (to-str p)]
     (if (= \- (first p))
-      (prefix p s) 
+      (prefix p s)
       (prefix (str \- p) s))))
 
 ;; ---------------------------------------------------------------------
@@ -150,7 +150,7 @@
 (defn clip
   "Return a number such that n is no less than a and no more than b."
   [a b n]
-  (let [[a b] (if (<= a b) [a b] [b a])] 
+  (let [[a b] (if (<= a b) [a b] [b a])]
     (max a (min b n))))
 
 (defn average