Version 0.3.8

Version 0.3.8

--- project.clj
+++ project.clj
@@ -1,20 +1,20 @@
-(defproject com.lemondronor/turboshrimp "0.3.8-SNAPSHOT"
+(defproject com.lemondronor/turboshrimp "0.3.8"
   :description "Clojure API for the Parrot AR.Drone."
   :url "https://github.com/wiseman/turboshrimp"
   :license {:name "MIT License"
             :url "http://opensource.org/licenses/MIT"}
   :deploy-repositories [["releases" :clojars]]
   :dependencies [[de.kotka/lazymap "3.1.1"]
-                 [gloss "0.2.4"]
-                 [org.clojure/clojure "1.6.0"]
+                 [gloss "0.2.6"]
+                 [org.clojure/clojure "1.8.0"]
                  [org.clojure/tools.logging "0.3.1"]]
   :java-source-paths ["src/java"]
   :profiles {:dev {:dependencies [[com.lemonodor/xio "0.2.2"]
                                   [org.clojars.echo/test.mock "0.1.2"]]
                    :plugins [[lein-cloverage "1.0.2"]]}
              :example {:dependencies
-                       [[com.lemondronor/turboshrimp-xuggler "0.0.2"]
-                        [com.lemonodor/gflags "0.7.1"]
+                       [[com.lemondronor/turboshrimp-xuggler "0.0.4"]
+                        [com.lemonodor/gflags "0.7.3"]
                         [com.lemonodor/xio "0.2.2"]
                         [seesaw "1.4.4"]]
                        :source-paths ["examples"]}


Version 0.1.9

Version 0.1.9

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject soy-clj "0.1.9-SNAPSHOT"
+(defproject soy-clj "0.1.9"
   :description "An idiomatic Clojure wrapper for Google's Closure templating system."
   :url "https://github.com/codahale/soy-clj"
   :license {:name "Eclipse Public License"


Upgrade dependencies

Upgrade dependencies

--- project.clj
+++ project.clj
@@ -4,13 +4,13 @@
   :license {:name "GNU AFFERO GENERAL PUBLIC LICENSE Version 3"
             :url "http://www.gnu.org/licenses/agpl-3.0.html"}
   :dependencies [
-                 [cheshire "5.3.1"]
-                 [cider-ci/clj-auth "2.1.0-rc.4"]
-                 [cider-ci/clj-utils "2.0.1-rc.1"]
-                 [org.clojure/tools.nrepl "0.2.3"]
-                 [org.jruby/jruby-complete "1.7.13"]
+                 [cheshire "5.4.0"]
+                 [cider-ci/clj-auth "2.1.0"]
+                 [cider-ci/clj-utils "2.0.1"]
+                 [org.clojure/tools.nrepl "0.2.6"]
+                 [org.jruby/jruby-complete "1.7.17"]
                  [ring-middleware-accept "2.0.2"]
-                 [ring/ring-core "1.3.1"]
+                 [ring/ring-core "1.3.2"]
                  [honeysql "0.4.3"]
                  ]
   :source-paths [ "json-roa/src"


Netty 3.8.0.Final

Netty 3.8.0.Final

--- project.clj
+++ project.clj
@@ -32,7 +32,7 @@
     [com.amazonaws/aws-java-sdk "1.4.1"]
     [incanter/incanter-core "1.4.1"]
     [interval-metrics "0.0.2"]
-    [io.netty/netty "3.6.1.Final"]
+    [io.netty/netty "3.8.0.Final"]
     [log4j/apache-log4j-extras "1.0"]
     [org.antlr/antlr "3.2"]
     [org.slf4j/slf4j-log4j12 "1.6.4"]


[Refactor] Modified project.clj to be version 1.0.0

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject folder-monitor "0.1.0-SNAPSHOT"
+(defproject folder-monitor "1.0.0-SNAPSHOT"
   :description "Folder-Monitor: Monitors a folder for new files and renames them appropriately"
   :url "https://github.com/richardartoul/folder-monitor"
   :license {:name "Eclipse Public License"


Update org.seleniumhq.selenium/selenium-server to 2.46.0

--- project.clj
+++ project.clj
@@ -44,7 +44,7 @@
                         [com.cemerick/piggieback "0.2.1"]
                         [org.seleniumhq.selenium/selenium-java "2.45.0"]
                         [org.seleniumhq.selenium/selenium-remote-driver "2.45.0"]
-                        [org.seleniumhq.selenium/selenium-server "2.45.0"]]
+                        [org.seleniumhq.selenium/selenium-server "2.46.0"]]

          :plugins [[jonase/eastwood "0.2.1"]
                    [com.keminglabs/cljx "0.5.0" :exclusions [org.clojure/clojure]]]


release 0.0.6-0.7 with producer type hints to avoid reflection

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject clj-kafka/clj-kafka "0.0.5-0.7"
+(defproject clj-kafka/clj-kafka "0.0.6-0.7"
   :min-lein-version "2.0.0"
   :dependencies [[org.clojure/clojure "1.3.0"]
                  [org.clojars.paul/core-kafka_2.8.0 "0.7.0-1"


Bump core async.

Bump core async.

--- project.clj
+++ project.clj
@@ -12,7 +12,7 @@
                              :password :env
                              :sign-releases false}}
   :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/core.async "0.3.442"]
+                 [org.clojure/core.async "0.3.443"]
                  [org.apache.curator/curator-framework "2.9.1"]
                  [org.apache.curator/curator-test "2.9.1"]
                  [org.apache.zookeeper/zookeeper "3.4.10" :exclusions [org.slf4j/slf4j-log4j12]]


:feelsgood:

:feelsgood:

--- project.clj
+++ project.clj
@@ -1,20 +1,27 @@
 (defproject me.ericb.puns "4.2.0-SNAPSHOT"
-  :description "Puns on puns on puns on the internet."
-  :url "http://puns.ericb.me"
-  :license {:name "MIT License"
-            :url "http://yurrriq.mit-license.org/2014/"}
+  :description  "Puns on puns on puns on the internet."
+  :url          "http://puns.ericb.me"
+  :license      {:name "MIT License"
+                 :url  "http://yurrriq.mit-license.org/2014/"}

-  :dependencies [[org.clojure/clojure "1.6.0"]
+  :dependencies [[org.clojure/clojure "1.7.0-beta2"]
+                 [org.clojure/clojurescript "0.0-3211"]
+                 [org.clojure/core.async "0.1.346.0-17112a-alpha"]
                  [org.clojure/core.typed "0.2.87"]
                  [clojure-opennlp "0.3.3"]
                  [com.taoensso/nippy "2.8.0"]
                  [factual/clj-leveldb "0.1.1"]
+                 [cheshire "5.4.0"]
                  #_[clj-fuzzy "0.2.1"]
                  [compojure "1.3.3"]
+                 [environ "1.0.0"]
+                 [garden "1.2.5"]
+                 [hiccup "1.0.5"]
                  [http-kit "2.1.19"]
+                 [reagent "0.5.0"]
                  [ring/ring-defaults "0.1.4"]
                  [stencil "0.3.5"]]

-  :main ^:skip-aot puns.core
-  :target-path "target/%s"
-  :profiles {:uberjar {:aot :all}})
+  :main          ^:skip-aot puns.core
+
+  :profiles      {:uberjar {:aot :all}})


lein-release plugin: preparing 0.73 release

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject exploud "0.73-SNAPSHOT"
+(defproject exploud "0.73"
   :description "Exploud service"
   :url "http://wikis.in.nokia.com/NokiaMusicArchitecture/Exploud"


next iteration

next iteration

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
- (defproject com.ladderlife/om-css "0.5.6"
+ (defproject com.ladderlife/om-css "0.5.7-SNAPSHOT"
   :description "Om Next + CSS"
   :url "http://github.com/ladderlife/om-css"
   :license {:name "Eclipse Public License"


Version 3.3.0

Version 3.3.0

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject lymingtonprecision/route-ccrs "3.3.0-SNAPSHOT"
+(defproject lymingtonprecision/route-ccrs "3.3.0"
   :description "A library for calculating part/routing end dates and CCRs"
   :url "https://github.com/lymingtonprecision/route-ccrs"
   :license {:name "Eclipse Public License"


Version 0.3.3-SNAPSHOT

Version 0.3.3-SNAPSHOT

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject clojure.java-time "0.3.2"
+(defproject clojure.java-time "0.3.3-SNAPSHOT"
   :description "Clojure wrapper for Java 8 Time API"
   :url "http://github.com/dm3/clojure.java-time"
   :license {:name "MIT License"


Prepare for next development iteration (0.3.0-SNAPSHOT)

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject jungerer "0.2.0"
+(defproject jungerer "0.3.0-SNAPSHOT"
   :description "Clojure network/graph library wrapping JUNG"
   :url "https://github.com/totakke/jungerer"
   :license {:name "The BSD 3-Clause License"


Update dependencies

Update dependencies

--- project.clj
+++ project.clj
@@ -3,18 +3,18 @@
   listings"
   :url "https://github.com/terop/ktra-indexer"
   :min-lein-version "2.0.0"
-  :dependencies [[org.clojure/clojure "1.10.0"]
+  :dependencies [[org.clojure/clojure "1.10.1"]
                  [compojure "1.6.1"]
                  [ring/ring-defaults "0.3.2"]
                  [ring/ring-devel "1.7.1"]
                  [org.immutant/web "2.1.10"]
-                 [selmer "1.12.8"]
+                 [selmer "1.12.12"]
                  [cheshire "5.8.1"]
-                 [org.postgresql/postgresql "42.2.5"]
+                 [org.postgresql/postgresql "42.2.6"]
                  [org.clojure/java.jdbc "0.7.9"]
                  [honeysql "0.9.4"]
                  [clj-time "0.15.1"]
-                 [buddy/buddy-auth "2.1.0"]
+                 [buddy/buddy-auth "2.2.0"]
                  [com.yubico/yubico-validation-client2 "3.0.5"]
                  [org.apache.commons/commons-text "1.6"]
                  [org.clojure/tools.logging "0.4.1"]


Release version 0.12.6.0.

Release version 0.12.6.0.

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject onyx-app/lein-template "0.12.5.1-SNAPSHOT"
+(defproject onyx-app/lein-template "0.12.6.0"
   :description "Onyx Leiningen application template"
   :url "https://github.com/onyx-platform/onyx-template"
   :license {:name "MIT License"


update datomic peer version

update datomic peer version

--- project.clj
+++ project.clj
@@ -30,10 +30,10 @@
              "-Ddatomic.txTimeoutMsec=1000000"]
   :profiles
   {:datomic-free
-   {:dependencies [[com.datomic/datomic-free "0.9.5561.50"
+   {:dependencies [[com.datomic/datomic-free "0.9.5561.56"
                     :exclusions [joda-time]]]}
    :datomic-pro
-   {:dependencies [[com.datomic/datomic-pro "0.9.5561.50"
+   {:dependencies [[com.datomic/datomic-pro "0.9.5561.56"
                     :exclusions [joda-time]]]}
    :ddb
    {:dependencies


new okta-ring version

new okta-ring version

--- project.clj
+++ project.clj
@@ -20,7 +20,7 @@
                  [ring "1.4.0"]
                  [org.clojure/tools.cli "0.3.3"]
                  [ring/ring-defaults "0.1.5"]
-                 [ring-okta "0.1.5"]
+                 [ring-okta "0.1.6"]
                  [ring.middleware.logger "0.5.0"]
                  [ring/ring-json "0.4.0"]
                  [prone "0.8.2"]


0.4.0

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject org.harto/huon "0.3.0"
+(defproject org.harto/huon "0.4.0"
   :description "ClojureScript interface to goog.debug.Logger"
   :url "https://github.com/harto/huon"
   :license {:name "MIT"


Prepare for next release cycle.

Prepare for next release cycle.

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject org.onyxplatform/onyx-dashboard "0.11.0.0-alpha5"
+(defproject org.onyxplatform/onyx-dashboard "0.11.0.0-SNAPSHOT"
   :description "Dashboard for the Onyx distributed computation system"
   :url "http://github.com/lbradstreet/onyx-dashboard"
   :license {:name "Eclipse Public License"


Bump version

Bump version

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject electron/lein-template "0.4.1"
+(defproject electron/lein-template "0.4.2"
   :description "A Leiningen template for an Electron/ClojureScript setup with Figwheel and Reagent."
   :url "https://github.com/ducky427/electron-template"
   :license {:name "MIT License"


Version 0.2.39

Version 0.2.39

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject yetibot.core "0.2.39-SNAPSHOT"
+(defproject yetibot.core "0.2.39"
   :description "Core yetibot utilities, extracted for shared use among yetibot
                 and its various plugins"
   :url "https://github.com/devth/yetibot.core"


Version 2.2.3

Version 2.2.3

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject puppetlabs/lein-ezbake "2.2.3-SNAPSHOT"
+(defproject puppetlabs/lein-ezbake "2.2.3"
   :description "A system for building packages for trapperkeeper-based applications"
   :url "https://github.com/puppetlabs/ezbake"
   :license {:name "Apache License 2.0"


Upgrade dependencies.

Upgrade dependencies.

--- project.clj
+++ project.clj
@@ -22,13 +22,13 @@

   :dependencies [[compojure "1.1.8"]
                  [enlive "1.1.5"]
-                 [environ "0.5.0"]
+                 [environ "1.0.0"]
                  [http-kit "2.1.18"]
                  [javax.servlet/servlet-api "2.5"]
                  [org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2268"]
+                 [org.clojure/clojurescript "0.0-2311"]
                  [org.clojure/core.async "0.1.303.0-886421-alpha"]
-                 [org.clojure/tools.namespace "0.2.4"]
+                 [org.clojure/tools.namespace "0.2.5"]
                  [org.clojure/tools.nrepl "0.2.3"]
                  [ring "1.3.0"]
                  [ring/ring-devel "1.3.0"]]


Version 0.0.22

Version 0.0.22

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject pe-jdbc-utils "0.0.22-SNAPSHOT"
+(defproject pe-jdbc-utils "0.0.22"
   :description "A Clojure library of helper functions when working with JDBC."
   :url "https://github.com/evanspa/pe-jdbc-utils"
   :license {:name "MIT"


Prepare for next release cycle.

Prepare for next release cycle.

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject org.onyxplatform/onyx-dashboard "0.11.0.0-alpha3"
+(defproject org.onyxplatform/onyx-dashboard "0.11.0.0-SNAPSHOT"
   :description "Dashboard for the Onyx distributed computation system"
   :url "http://github.com/lbradstreet/onyx-dashboard"
   :license {:name "Eclipse Public License"


Bump dependency versions.

Bump dependency versions.

--- project.clj
+++ project.clj
@@ -4,12 +4,11 @@
   :source-path "src/clj"
   :java-source-path "src/jvm/"
   :javac-fork "true"
-  :dependencies [[org.clojure/clojure "1.1.0"]
-                 [org.clojure/clojure-contrib "1.1.0"]
+  :dependencies [[org.clojure/clojure "1.2.0-RC1"]
+                 [org.clojure/clojure-contrib "1.2.0-RC1"]
                  [clj-stacktrace "0.1.2"]
                  [net.sf.jopt-simple/jopt-simple "3.2"]
                  [clj-json "0.2.0"]]
-  :dev-dependencies [[org.clojars.mmcgrana/lein-clojars "0.5.0"]
-                     [org.clojars.mmcgrana/lein-javac "0.1.0"]
+  :dev-dependencies [[lein-javac "1.2.1-SNAPSHOT"]
                      [clj-unit "0.1.0"]]
   :namespaces [fleetdb.server])


bump cheshire

bump cheshire

--- project.clj
+++ project.clj
@@ -5,6 +5,6 @@
             :url "http://opensource.org/licenses/BSD-3-Clause"
             :distribution :repo}
   :dependencies [[org.clojure/clojure "1.4.0"]
-                 [cheshire "4.0.4"]
+                 [cheshire "5.0.0"]
                  [commons-codec "1.6"]
                  [joda-time "2.1"]])


Version 0.5.1-SNAPSHOT

Version 0.5.1-SNAPSHOT

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject sablono "0.5.0"
+(defproject sablono "0.5.1-SNAPSHOT"
   :description "Lisp style templating for Facebook's React."
   :url "http://github.com/r0man/sablono"
   :author "r0man"


project.clj cleaning

project.clj cleaning

--- project.clj
+++ project.clj
@@ -10,7 +10,7 @@
             [lein-cljfmt "0.5.6"]
             [lein-deps-tree "0.1.2"]
             [lein-marginalia "0.9.0"]
-            [com.jakemccrary/lein-test-refresh "0.18.1"]
+            [com.jakemccrary/lein-test-refresh "0.19.0"]
             [lein-codox "0.10.3"]]
   :url "https://github.com/Clojure2D/clojure2d"
   :license {:name "MIT"
@@ -20,17 +20,18 @@
                  [org.apache.commons/commons-math3 "3.6.1"]
                  [com.flowpowered/flow-noise "1.0.0"]
                  [com.sudoplay.joise/joise "1.0.5"]
-		 [de.sciss/jwave "1.0.3"]
+                                        ;	 [de.sciss/jwave "1.0.3"]
                  [criterium "0.4.4"]
-                 [primitive-math "0.1.5"]]
+                                        ; [org.bytedeco/javacv-platform "1.3.2"]
+                 ]
   :resource-path "resources/"
   :repl-options {:timeout 120000}
   :target-path "target/%s"
   :jvm-opts ["-Xmx4096M"
-          ;   "-Dcom.sun.management.jmxremote"
-          ;   "-Dcom.sun.management.jmxremote.ssl=false"
-          ;   "-Dcom.sun.management.jmxremote.authenticate=false"
-          ;   "-Dcom.sun.management.jmxremote.port=43210"
+                                        ;   "-Dcom.sun.management.jmxremote"
+                                        ;   "-Dcom.sun.management.jmxremote.ssl=false"
+                                        ;   "-Dcom.sun.management.jmxremote.authenticate=false"
+                                        ;   "-Dcom.sun.management.jmxremote.port=43210"
              ]
   :marginalia {:javascript ["https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-MML-AM_CHTML"]}
   :profiles {:uberjar {:aot :all}})


Update fress lib to version 0.3.1.

Update fress lib to version 0.3.1.

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject io.replikativ/konserve "0.5.0-beta4"
+(defproject io.replikativ/konserve "0.5.1-SNAPSHOT"
   :description "Durable cross-platform key-value store protocol with core.async."
   :url "http://github.com/replikativ/konserve"
   :license {:name "Eclipse Public License"
@@ -8,11 +8,11 @@
   :dependencies [[org.clojure/clojure "1.9.0" :scope "provided"]
                  [org.clojure/clojurescript "1.9.946" :scope "provided"]
                  [io.replikativ/incognito "0.2.5-SNAPSHOT"]
-                 [fress "0.2.0"]
+                 [fress "0.3.1"]
                  [org.clojure/core.async "0.4.474"]

                  [org.clojure/data.fressian "0.2.1"] ;; for filestore
-
+
                  [io.replikativ/hasch "0.3.5"]
                  [org.clojars.mmb90/cljs-cache "0.1.4"]]

@@ -39,4 +39,3 @@
                 :optimizations :none
                 :target :nodejs
                 :main konserve.konserve-test}}}})
-


version bump

version bump

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject lspector/clojush "1.2.35"
+(defproject lspector/clojush "1.2.36"
             :description "The Push programming language and the PushGP genetic programming
                           system implemented in Clojure.
                           See http://hampshire.edu/lspector/push.html"


updated dependencies

updated dependencies

--- project.clj
+++ project.clj
@@ -5,12 +5,12 @@
             :url "http://opensource.org/licenses/mit-license.html"}

   :dependencies [[org.clojure/clojure "1.7.0"]
-                 [org.clojure/clojurescript "1.7.107"]
+                 [org.clojure/clojurescript "1.7.122"]
                  [org.clojure/core.async "0.1.346.0-17112a-alpha"]
                  [org.omcljs/om "0.9.0"]]

   :plugins [[lein-cljsbuild "1.1.0"]
-            [lein-figwheel "0.3.7"]]
+            [lein-figwheel "0.3.9"]]

   :source-paths ["src" "test"]


Add repo config

Add repo config

--- project.clj
+++ project.clj
@@ -60,4 +60,7 @@
                                                           :preamble ["react/react.min.js"]
                                                           :pretty-print true}
                                                }
-                                        }}}})
+                                        }}}}
+
+  :repositories [["snapshots" {:url "http://nexus.brightnorth.co.uk/content/repositories/snapshots" :password :env :username :env}]
+                 ["releases" {:url "http://nexus.brightnorth.co.uk/content/repositories/releases" :password :env :username :env}]])


Upgrade test-check

Upgrade test-check

--- project.clj
+++ project.clj
@@ -49,7 +49,7 @@
   :target-path "target/%s"
   :profiles {:uberjar {:aot :all}
              :dev {:dependencies [[peridot "0.3.0"]
-                                  [org.clojure/test.check "0.5.9"]]
+                                  [org.clojure/test.check "0.6.2"]]
                    :aliases ^:replace {"lint" ["do"
                                                ["clean"]
                                                ["with-profile" "production" "deps" ":tree"]


Version 0.1.1

Version 0.1.1

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject websocket-client "0.1.1-SNAPSHOT"
+(defproject websocket-client "0.1.1"
   :description "WebSocket Client Library"
   :url "https://github.com/ftravers/websocket-client"
   :license {:name "Eclipse Public License"


Version 0.4.0-alpha10-SNAPSHOT

Version 0.4.0-alpha10-SNAPSHOT

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject yetibot.core "0.4.0-alpha9"
+(defproject yetibot.core "0.4.0-alpha10-SNAPSHOT"
   :description "Core yetibot utilities, extracted for shared use among yetibot
                 and its various plugins"
   :url "https://github.com/devth/yetibot.core"


Could this be a dependency ordering issue?

--- project.clj
+++ project.clj
@@ -11,7 +11,7 @@
                  [clj-http "0.9.1"] ;; Perform http requests.
                  [http-kit "2.1.16"]
                  [clj-jwt "0.0.6"] ;; Generate signed json web-tokens.
-                 [persona-kit "0.1.1-SNAPSHOT" :exclusions [org.clojure/google-closure-library]] ;; Authentication - Persona.
+                 [persona-kit "0.1.1-SNAPSHOT"] ;; Authentication - Persona.
                  [com.cemerick/friend "0.2.0"] ;; Authentication.
                  [clj-time "0.6.0"] ;; deal with time.
                  [javax.servlet/servlet-api "2.5"] ;; Needed for middleware.
@@ -29,8 +29,8 @@
                  [cheshire "4.0.3"];; JSON serialisation
                  [clj-jgit "0.6.5-d"] ;; Git interface.
                  [org.mozilla/rhino "1.7R4"] ;; We depend on rhino 1.7r4
+                 [org.clojars.involans/dieter "0.5.0-SNAPSHOT"]
                  [org.lesscss/lesscss "1.7.0.1.1"] ;; Less 1.7.0
-                 [org.clojars.involans/dieter "0.5.0-SNAPSHOT"]
                  [hiccup "1.0.5"] ;; Templating
                  ;; Deal with load issues.
                  ;; see: https://github.com/LightTable/LightTable/issues/794


(maint) Merge up 21e1924 to main

(maint) Merge up 21e1924 to main

Generated by CI

* commit '21e192402041a09348af969500df0841c07e9860':
  Set clj-parent=4.6.23
  (maint) update submodule versions and agent pin

--- project.clj
+++ project.clj
@@ -27,7 +27,7 @@

   :min-lein-version "2.9.1"

-  :parent-project {:coords [puppetlabs/clj-parent "4.6.22"]
+  :parent-project {:coords [puppetlabs/clj-parent "4.6.23"]
                    :inherit [:managed-dependencies]}

   :dependencies [[org.clojure/clojure]


lein-release plugin: preparing 0.50 release

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject shuppet "0.50-SNAPSHOT"
+(defproject shuppet "0.50"
   :description "Shuppet service"
   :url "http://wikis.in.nokia.com/NokiaMusicArchitecture/Shuppet"


Version 1.0.3

Version 1.0.3

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject mr-clojure/lein-template "1.0.3-SNAPSHOT"
+(defproject mr-clojure/lein-template "1.0.3"
   :description "MixRadio clojure skeleton template for Leiningen. Generates a Clojure HTTP REST service in the style of MixRadio"
   :url "http://github.com/mixradio/mr-clojure"
   :eval-in-leiningen true


Version 2.0.1-SNAPSHOT

Version 2.0.1-SNAPSHOT

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject com.saga-it/mirthsync "2.0.0-SNAPSHOT"
+(defproject com.saga-it/mirthsync "2.0.1-SNAPSHOT"
   :description "Mirthsync is a command line tool, created by Saga IT,
   for keeping a local copy of important aspects of Mirth Connect
   configuration in order to allow for the use of traditional version


Release 0.0.1

Release 0.0.1

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject com.chpill.re-frankenstein "0.0.1-SNAPSHOT"
+(defproject com.chpill.re-frankenstein "0.0.1"
   :description  "The deviant fork of re-frame"
   :url          "https://github.com/chpill/re-frankenstein.git"
   :license      {:name "MIT"}


Version 0.3.7

Version 0.3.7

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject com.lemondronor/turboshrimp "0.3.7-SNAPSHOT"
+(defproject com.lemondronor/turboshrimp "0.3.7"
   :description "Clojure API for the Parrot AR.Drone."
   :url "https://github.com/wiseman/turboshrimp"
   :license {:name "MIT License"


upgrade mranderson to enable inlining .cljc files

--- project.clj
+++ project.clj
@@ -14,7 +14,7 @@
                  ^:source-dep [me.raynes/fs "1.4.6"]
                  ^:source-dep [rewrite-clj "0.4.12"]
                  ^:source-dep [cljs-tooling "0.1.7"]]
-  :plugins [[thomasa/mranderson "0.4.5"]]
+  :plugins [[thomasa/mranderson "0.4.6"]]
   :filespecs [{:type :bytes :path "refactor-nrepl/refactor-nrepl/project.clj" :bytes ~(slurp "project.clj")}]
   :profiles {:provided {:dependencies [[cider/cider-nrepl "0.9.0"]]}
              :test {:dependencies [[print-foo "1.0.1"]]


Prepare for future development.

Prepare for future development.

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject afterglow "0.1.5"
+(defproject afterglow "0.1.6-SNAPSHOT"
   :description "A live-coding environment for light shows, built on the Open Lighting Architecture, using bits of Overtone."
   :url "https://github.com/brunchboy/afterglow"
   :license {:name "Eclipse Public License"


Prepare for next release cycle.

Prepare for next release cycle.

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject onyx-app/lein-template "0.11.1.0-alpha2"
+(defproject onyx-app/lein-template "0.11.1.0-SNAPSHOT"
   :description "Onyx Leiningen application template"
   :url "https://github.com/onyx-platform/onyx-template"
   :license {:name "MIT License"


Version 0.2.9-SNAPSHOT

Version 0.2.9-SNAPSHOT

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject soy-clj "0.2.8"
+(defproject soy-clj "0.2.9-SNAPSHOT"
   :description "An idiomatic Clojure wrapper for Google's Closure templating system."
   :url "https://github.com/codahale/soy-clj"
   :license {:name "Eclipse Public License"


Fix dependency conflict in coverage task.

--- project.clj
+++ project.clj
@@ -41,4 +41,5 @@
                    [org.clojure/clojurescript "1.9.93"]]}

    :coverage
-   {:plugins [[rfkm/lein-cloverage "1.0.8"]]}})
+   {:plugins [[rfkm/lein-cloverage "1.0.8"]]
+    :dependencies [[org.clojure/tools.reader "1.0.0-beta1"]]}})


lein-release plugin: bumped version from 0.77 to 0.78-SNAPSHOT for next development cycle

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject pedantic "0.77"
+(defproject pedantic "0.78-SNAPSHOT"
   :description "Pedantic service"
   :license  "https://github.com/mixradio/mr-pedantic/blob/master/LICENSE"


Bump version for the next dev cycle

Bump version for the next dev cycle

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject refactor-nrepl "2.4.0"
+(defproject refactor-nrepl "2.4.1-SNAPSHOT"
   :description "nREPL middleware to support editor-agnostic refactoring"
   :url "http://github.com/clojure-emacs/refactor-nrepl"
   :license {:name "Eclipse Public License"
@@ -10,7 +10,7 @@
                  ^:source-dep [org.clojure/tools.namespace "0.3.0-alpha3"]
                  ;; Not used directly in refactor-nrepl, but needed because of tool.namespace
                  ;; and the way MrAnderson processes dependencies
-                 ;; See https://github.com/clojure-emacs/cider/issues/2176 for details
+                 ;; See https://github.com/clojure-emacs/cider/issues/2176 for details
                  ^:source-dep [org.clojure/java.classpath "0.2.3"]
                  ^:source-dep [org.clojure/tools.reader "1.1.1"]
                  ^:source-dep [cider/orchard "0.3.0"]


Moved lein-ancient plugin to user profile.

--- project.clj
+++ project.clj
@@ -65,8 +65,7 @@
              :uberjar {:env {:production true}
                        :aot :all}}
   :plugins [[codox "0.8.13"]
-            [lein-environ "1.0.1"]
-            [lein-ancient "0.6.7"]]
+            [lein-environ "1.0.1"]]

   :codox {:src-dir-uri "http://github.com/brunchboy/afterglow/blob/master/"
           :src-linenum-anchor-prefix "L"


update core dependencies

update core dependencies

--- project.clj
+++ project.clj
@@ -4,8 +4,8 @@
   :license {:name "The MIT License (MIT)"
             :url "http://opensource.org/licenses/mit-license.html"}

-  :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-3211"]
+  :dependencies [[org.clojure/clojure "1.7.0-RC2"]
+                 [org.clojure/clojurescript "0.0-3308"]
                  [org.clojure/core.async "0.1.346.0-17112a-alpha"]
                  [org.omcljs/om "0.8.8"]]


Version 3.2.1-SNAPSHOT

Version 3.2.1-SNAPSHOT

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject dda/dda-managed-ide "3.2.0"
+(defproject dda/dda-managed-ide "3.2.1-SNAPSHOT"
   :description "module to install and configure ide based on ubuntu vm."
   :url "https://www.domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"


(MAINT) Bump version to 1.1.2-SNAPSHOT for next release

--- project.clj
+++ project.clj
@@ -1,7 +1,7 @@
 (def tk-version "1.1.1")
 (def tk-jetty-version "1.3.1")
 (def ks-version "1.1.0")
-(def ps-version "1.1.1")
+(def ps-version "1.1.2-SNAPSHOT")

 (defn deploy-info
   [url]


dependencies

dependencies

--- project.clj
+++ project.clj
@@ -10,7 +10,7 @@
                  [matthiasn/systems-toolbox "0.6.1-SNAPSHOT"]]

   :profiles {:dev  {:dependencies   [[org.clojure/clojure "1.9.0-alpha7"]
-                                     [org.clojure/clojurescript "1.9.88"]
+                                     [org.clojure/clojurescript "1.9.93"]
                                      [matthiasn/systems-toolbox-sente "0.6.1-SNAPSHOT"]
                                      [ch.qos.logback/logback-classic "1.1.7"]
                                      [hiccup "1.0.5"]
@@ -20,7 +20,7 @@
                                      [org.seleniumhq.selenium/selenium-htmlunit-driver "2.52.0"]
                                      [org.seleniumhq.selenium/selenium-remote-driver "2.53.0"]
                                      [org.seleniumhq.selenium/selenium-chrome-driver "2.53.0"]
-                                     [com.codeborne/phantomjsdriver "1.2.1"]
+                                     [com.codeborne/phantomjsdriver "1.3.0"]
                                      [clj-webdriver "0.7.2"]]
                     :resource-paths ["test-resources"]}
              :test {:resource-paths ["test-resources"]


Upgrade to the latest lib.

Upgrade to the latest lib.

--- project.clj
+++ project.clj
@@ -24,7 +24,7 @@
     [org.clojure/tools.namespace "0.3.0" :exclusions [org.clojure/tools.reader]]

     ;; Library for OC projects https://github.com/open-company/open-company-lib
-    [open-company/lib "0.17.12"]
+    [open-company/lib "0.17.13-alpha2"]
     ;; In addition to common functions, brings in the following common dependencies used by this project:
     ;; Component - Component Lifecycle https://github.com/stuartsierra/component
     ;; Schema - Data validation https://github.com/Prismatic/schema
@@ -68,7 +68,7 @@
         :aws-sqs-email-queue "https://sqs.REGION.amazonaws.com/CHANGE/ME"
         :email-from-domain "change.me"
         :email-digest-prefix "[Localhost] "
-        :email-images-prefix "https://CHANGE-ME.s3.amazonaws.com"
+        :email-images-prefix "https://open-company-assets-non-prod.s3.amazonaws.com"
         :filestack-api-key "CHANGE-ME"
         :intro "true"
         :log-level "debug"


Update version

Update version

--- project.clj
+++ project.clj
@@ -3,7 +3,7 @@
 (def git-commit (or (System/getenv "GIT_COMMIT")
                     (System/getenv "TRAVIS_COMMIT")))

-(defproject qu/qu-core "1.1.1"
+(defproject qu/qu-core "1.1.2-SNAPSHOT"
   :description "qu is an **in-progress** data platform created by the CFPB to
 serve their public data sets."
   :license {:name "Public Domain"}


Upgrade Clojure to 1.10.2

Upgrade Clojure to 1.10.2

--- project.clj
+++ project.clj
@@ -3,7 +3,7 @@
   :url          "https://github.com/day8/re-frame.git"
   :license      {:name "MIT"}

-  :dependencies [[org.clojure/clojure       "1.10.1"   :scope "provided"]
+  :dependencies [[org.clojure/clojure       "1.10.2"   :scope "provided"]
                  [org.clojure/clojurescript  ~(or (System/getenv "CANARY_CLOJURESCRIPT_VERSION") "1.10.773")
                   :scope "provided"
                   :exclusions [com.google.javascript/closure-compiler-unshaded


Version 0.2.14

Version 0.2.14

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject soy-clj "0.2.14-SNAPSHOT"
+(defproject soy-clj "0.2.14"
   :description "An idiomatic Clojure wrapper for Google's Closure templating system."
   :url "https://github.com/codahale/soy-clj"
   :license {:name "Eclipse Public License"


Add cljsbuild to prep-tasks so that uberjar picks it up

--- project.clj
+++ project.clj
@@ -8,6 +8,7 @@
   :plugins [[lein-cljsbuild "1.1.0"]]
   :clean-targets ^{:protect false} [:target-path
                                     "resources/public/warp"]
+  :prep-tasks ["compile" ["cljsbuild" "once"]]
   :cljsbuild {
     :builds [{:id "om-warp"
               :source-paths ["src/org/spootnik/om_warp"]


Ready for release

Ready for release

--- project.clj
+++ project.clj
@@ -1,6 +1,6 @@
 ;; Copyright © 2015, JUXT LTD.

-(defproject aero "1.1.0"
+(defproject aero "1.1.1"
   :description "A small library for explicit, intentful configuration."
   :url "http://github.com/juxt/aero"
   :license {:name "The MIT License"


Bump v0.1.3

Bump v0.1.3

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject event-data-event-bus "0.1.2"
+(defproject event-data-event-bus "0.1.3"
   :description "Event Bus for Event Data"
   :url "http://eventdata.crossref.org/"
   :license {:name "MIT License"


Added alembic as dep for hotloading deps

--- project.clj
+++ project.clj
@@ -12,7 +12,8 @@
   :plugins [[lein-droid "0.4.6"]]

   :dependencies [[org.clojure-android/clojure "1.7.0-r4"]
-                 [neko/neko "4.0.0-alpha5"]]
+                 [neko/neko "4.0.0-alpha5"]
+                 [alembic "0.3.2"]]
   :profiles {:default [:dev]

              :dev


adapted version

adapted version

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject de.sveri/friendui "0.1.1-1"
+(defproject de.sveri/friendui "0.1.2"
   :description "A frontend for friend library using selmer and storing data in datomic"
   :url "https://github.com/sveri/friend-ui/"
   :license {:name "Eclipse Public License"


(MAINT) Bump tk-jetty9-version to CVE_2016_2785_1

This commit bumps the tk-jetty9 version up to CVE_2016_2785_1.

--- project.clj
+++ project.clj
@@ -1,6 +1,6 @@
 (def clj-version "1.7.0")
 (def tk-version "1.3.1")
-(def tk-jetty-version "1.5.5-CVE_2016_2785_0")
+(def tk-jetty-version "1.5.5-CVE_2016_2785_1")
 (def ks-version "1.3.0")
 (def ps-version "2.3.2-stable-SNAPSHOT")


Upgrade compojure

Upgrade compojure

--- project.clj
+++ project.clj
@@ -32,7 +32,7 @@
                   :exclusions [org.clojure/clojure]]

                  ;; REST API
-                 [compojure "1.3.1"]
+                 [compojure "1.3.2"]
                  [ring/ring-defaults "0.1.4"]
                  [ring-middleware-format "0.4.0"]]
   :test-selectors {:default (complement (some-fn :riak))


Update dependencies.

Update dependencies.

--- project.clj
+++ project.clj
@@ -14,9 +14,9 @@

   :dependencies [
     ;; Server-side
-    [org.clojure/clojure "1.8.0-beta1"] ; Lisp on the JVM http://clojure.org/documentation
+    [org.clojure/clojure "1.8.0-beta2"] ; Lisp on the JVM http://clojure.org/documentation
     [org.clojure/core.match "0.3.0-alpha4"] ; Erlang-esque pattern matching https://github.com/clojure/core.match
-    [defun "0.2.0"] ; Erlang-esque pattern matching for Clojure functions https://github.com/killme2008/defun
+    [defun "0.3.0-alapha"] ; Erlang-esque pattern matching for Clojure functions https://github.com/killme2008/defun
     [org.clojure/core.incubator "0.1.3"] ; Functions proposed for inclusion in Clojure https://github.com/clojure/core.incubator
     [cheshire "5.5.0"] ; JSON de/encoding https://github.com/dakrone/cheshire
     [org.flatland/ordered "1.5.3"] ; Ordered hash map https://github.com/flatland/ordered
@@ -46,11 +46,14 @@
         :hot-reload false
       }
       :dependencies [
+        ; --- DO NOT UPDATE MIDJE, it breaks the tests https://github.com/marick/Midje/issues/323
+        [midje "1.7.0"] ; Example-based testing https://github.com/marick/Midje
+
         [midje "1.7.0"] ; Example-based testing https://github.com/marick/Midje
         [ring-mock "0.1.5"] ; Test Ring requests https://github.com/weavejester/ring-mock
       ]
       :plugins [
-        [lein-midje "3.2-RC4"] ; Example-based testing https://github.com/marick/lein-midje
+        [lein-midje "3.2"] ; Example-based testing https://github.com/marick/lein-midje
         [jonase/eastwood "0.2.1"] ; Clojure linter https://github.com/jonase/eastwood
       ]
     }
@@ -67,7 +70,7 @@
       ]
       :plugins [
         [lein-cljsbuild "1.1.0"] ; ClojureScript compiler https://github.com/emezeske/lein-cljsbuild
-        [codox "0.8.15"] ; Generate Clojure API docs https://github.com/weavejester/codox
+        [codox "0.9.0"] ; Generate Clojure API docs https://github.com/weavejester/codox
         [lein-bikeshed "0.2.0"] ; Check for code smells https://github.com/dakrone/lein-bikeshed
         [lein-kibit "0.1.2"] ; Static code search for non-idiomatic code https://github.com/jonase/kibit
         [lein-checkall "0.1.1"] ; Runs bikeshed, kibit and eastwood https://github.com/itang/lein-checkall


lein-release plugin: bumped version from 0.7 to 0.8-SNAPSHOT for next development cycle

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject chaintool "0.7"
+(defproject chaintool "0.8-SNAPSHOT"
   :description "hyperledger chaincode tool"
   :url "https://github.com/ghaskins/chaintool"
   :license {:name "Apache License"


bumped version

bumped version

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject selmer "0.6.8"
+(defproject selmer "0.6.9"
   :description "Django templates for Clojure"
   :url "https://github.com/yogthos/Selmer"
   :license {:name "Eclipse Public License"


Update dependencies (#151)

Update dependencies (#151)

--- project.clj
+++ project.clj
@@ -11,10 +11,10 @@
                                   [criterium "0.4.4"]
                                   [devcards "0.2.2" :exclusions [sablono]]
                                   [doo "0.1.7"]
-                                  [figwheel-sidecar "0.5.8"]
+                                  [figwheel-sidecar "0.5.9"]
                                   [funcool/tubax "0.2.0"]
                                   [reagent "0.6.0"]
-                                  [rum "0.10.7"]]
+                                  [rum "0.10.8"]]
                    :plugins [[lein-cljsbuild "1.1.4"]
                              [lein-doo "0.1.7"]
                              [lein-figwheel "0.5.8"]
@@ -23,7 +23,7 @@
              :provided {:dependencies [[cljsjs/react "15.3.1-0"]
                                        [cljsjs/react-dom "15.3.1-0"]
                                        [cljsjs/react-dom-server "15.3.1-0"]
-                                       [org.clojure/clojurescript "1.9.293"]]}
+                                       [org.clojure/clojurescript "1.9.456"]]}
              :repl {:dependencies [[com.cemerick/piggieback "0.2.1"]]
                     :repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}}}
   :aliases {"ci" ["do"


Added the cloverage (coverage) plugin

Added the cloverage (coverage) plugin

--- project.clj
+++ project.clj
@@ -7,6 +7,7 @@
                  [quil "2.4.0"]
                  [org.clojure/tools.logging "0.3.1"]
                  [ch.qos.logback/logback-classic "1.1.3"]]
+  :plugins      [[lein-cloverage "1.0.6"]]
   :main ^:skip-aot chip8-clj.main
   :target-path "target/%s"
   :profiles {:uberjar {:aot :all}})


bump eastwood dep

bump eastwood dep

--- project.clj
+++ project.clj
@@ -20,7 +20,7 @@
              :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}
              :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
              :1.7 {:dependencies [[org.clojure/clojure "1.7.0-master-SNAPSHOT"]]}
-             :dev {:plugins [[jonase/eastwood "0.1.4"]]
+             :dev {:plugins [[jonase/eastwood "0.2.0"]]
                    :dependencies [[me.raynes/fs "1.4.6"]]
                    :resource-paths ["test/resources"
                                     "resources/testproject/src"]


Story ID: develop Summary: - add internal-snapshots artifact repo to project Comments to QA/Testers: Changelog:

--- project.clj
+++ project.clj
@@ -13,6 +13,7 @@
                  [figwheel-sidecar "0.4.1" :scope "provided"]]

   :repositories [["releases" "https://artifacts.buehner-fry.com/artifactory/internal-release"]
+                 ["snapshots" "https://artifacts.buehner-fry.com/artifactory/internal-snapshots"]
                  ["third-party" "https://artifacts.buehner-fry.com/artifactory/internal-3rdparty"]]

   :deploy-repositories [["releases" {:url           "https://artifacts.buehner-fry.com/artifactory/internal-release"


bumped up version

bumped up version

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject reagent/lein-template "0.3.4"
+(defproject reagent/lein-template "0.3.5"
   :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent."
   :url "https://github.com/reagent-project/reagent-template"
   :license {:name "MIT License"


Add sonatype snapshots again for tools.nrepl

--- project.clj
+++ project.clj
@@ -8,6 +8,8 @@
                  [org.clojure/tools.nrepl "0.0.6-SNAPSHOT"]]
   :dev-dependencies [[midje "1.3-alpha4" :exclusions [org.clojure/clojure]]
                      [lein-midje "[1.0.0,)"]]
+  :repositories {
+    "sonatype" {:url "http://oss.sonatype.org/content/repositories/snapshots" } }
   :aot [reply.reader.jline.JlineInputReader]
   :source-path "src/clj"
   :java-source-path "src/java")


Set version to 0.12.0.

Set version to 0.12.0.

--- project.clj
+++ project.clj
@@ -1,4 +1,4 @@
-(defproject buddy/buddy-core "0.11.0"
+(defproject buddy/buddy-core "0.12.0"
   :description "Cryptographic Api for Clojure."
   :url "https://github.com/funcool/buddy-core"
   :license {:name "Apache 2.0"


Update version info.

Update version info.

--- project.clj
+++ project.clj
@@ -1,5 +1,5 @@
-;(defproject cli4clj "1.7.0"
-(defproject cli4clj "1.7.1-SNAPSHOT"
+(defproject cli4clj "1.7.1"
+;(defproject cli4clj "1.7.2-SNAPSHOT"
   :description "Create simple interactive CLIs for Clojure applications."
   :url "https://github.com/ruedigergad/cli4clj"
   :license {:name "Eclipse Public License"


(MAINT) Add license and URL fields to project.clj

--- project.clj
+++ project.clj
@@ -3,6 +3,9 @@

 (defproject puppetlabs/trapperkeeper-webserver-jetty9 "1.1.1-SNAPSHOT"
   :description "A jetty9-based webserver implementation for use with the puppetlabs/trapperkeeper service framework."
+  :url "https://github.com/puppetlabs/trapperkeeper-webserver-jetty9"
+  :license {:name "Apache License, Version 2.0"
+            :url "http://www.apache.org/licenses/LICENSE-2.0"}
   ;; Abort when version ranges or version conflicts are detected in
   ;; dependencies. Also supports :warn to simply emit warnings.
   ;; requires lein 2.2.0+.


Bump dependencies

Bump dependencies


Rely on defaults for release.

Rely on defaults for release.


version bump to 0.2.18

version bump to 0.2.18


Prepare for next release cycle.

Prepare for next release cycle.


lein-release plugin: preparing 0.16 release


empty commit

empty commit

--- src/cljs/cljs_react_material_ui_example/core.cljs
+++ src/cljs/cljs_react_material_ui_example/core.cljs
@@ -295,4 +295,3 @@

 (om/add-root! reconciler AppRoot (gdom/getElement "app"))

-


Added todo comment.

Added todo comment.

--- src/cljs/wombats_web_client/panels/game-play.cljs
+++ src/cljs/wombats_web_client/panels/game-play.cljs
@@ -64,7 +64,8 @@
 (defn- max-players [info]
   (let [{:keys [max-players]} @info]
     [:p.wombat-counter (when max-players
-          (str "Wombats: 1/" max-players))]))
+                         ;; TODO: Use player count here
+                         (str "Wombats: 1/" max-players))]))

 (defn chat-title []
   [:div.chat-title


update testing defaults.

update testing defaults.

--- src/cavm/core.clj
+++ src/cavm/core.clj
@@ -357,11 +357,13 @@
 ; (logback-config "log" "logback_repl.xml")

 ; (def testdb (h2/create-xenadb "test;TRACE_LEVEL_FILE=3"))
+
 ; (def testdb (h2/create-xenadb "/inside/home/craft/xena/database;TRACE_LEVEL_FILE=3"))
 ; (def testdetector (apply cr/detector "/inside/home/craft/xena/files" detectors))
 ; (def testloader (cl/loader-agent testdb testdetector "/inside/home/craft/xena/files"))
 ;            (watch (partial file-changed #'testloader docroot-default) docroot-default)
 ; (def app (get-app testdb testloader))
-; (defonce server (ring.adapter.jetty/run-jetty #'app {:port 7222 :join? false}))
+; (defonce server (ring.adapter.jetty/run-jetty #'app {:port 7321 :join? false}))
 ; (.start server)
+
 ; (.stop server)


Support caching additional models in amd-gcn.

--- src/clojure/uncomplicate/bayadera/opencl/amd_gcn.clj
+++ src/clojure/uncomplicate/bayadera/opencl/amd_gcn.clj
@@ -658,9 +658,11 @@
     neanderthal-factory))

 (defn gcn-bayadera-factory
-  ([ctx cqueue ^long compute-units ^long WGS]
+  ([ctx cqueue compute-units WGS add-dist add-samp]
    (let [tmp-dir-name (get-tmp-dir-name)
-         neanderthal-factory (opencl-single ctx cqueue)]
+         neanderthal-factory (opencl-single ctx cqueue)
+         distributions (merge distributions add-dist)
+         samplers (merge samplers add-samp)]
      (with-philox tmp-dir-name
        (->GCNBayaderaFactory
         ctx cqueue tmp-dir-name
@@ -677,6 +679,8 @@
                         (gcn-stretch-factory ctx cqueue tmp-dir-name
                                              neanderthal-factory % WGS)))
               distributions)))))
+  ([ctx cqueue compute-units WGS]
+   (gcn-bayadera-factory ctx cqueue compute-units WGS nil nil))
   ([ctx cqueue]
    (let [dev (queue-device cqueue)]
      (gcn-bayadera-factory ctx cqueue


Handle missing vcs-type

Handle missing vcs-type

--- src-cljs/frontend/pusher.cljs
+++ src-cljs/frontend/pusher.cljs
@@ -61,7 +61,8 @@
        :vcs-type (keyword (or vcs-type :github))})))

 (defn build-channel-base
-  [{:keys [project-name build-num vcs-type]}]
+  [{:keys [project-name build-num vcs-type]
+    :or {vcs-type :github}}]
   (let [project-prefix (-> (str "private-" project-name)
                            (string/replace "/" "@"))
         vcs-str (str "vcs-" (name vcs-type))]


Reduce size of CI tests to avoid CI timeout

--- test/aurora/btree_test.cljs
+++ test/aurora/btree_test.cljs
@@ -30,27 +30,27 @@
   aurora.btree/anti-symmetric-prop)

 (defspec total-prop-test
-  10000
+  5000
   aurora.btree/total-prop)

 (defspec building-assoc-test
-  10000
+  5000
   (aurora.btree/building-prop aurora.btree/gen-assoc))

 (defspec building-action-test
-  10000
+  5000
   (aurora.btree/building-prop aurora.btree/gen-action))

 (defspec lookup-action-test
-  10000
+  5000
   (aurora.btree/lookup-prop aurora.btree/gen-action))

 (defspec iterator-prop-test
-  10000
+  5000
   aurora.btree/iterator-prop)

 (defspec intersection-prop-test
-  1000
+  500
   aurora.btree/intersection-prop)

 (comment


Docstrings in tracker

Docstrings in tracker

--- src/main/clojure/clojure/tools/namespace/tracker.clj
+++ src/main/clojure/clojure/tools/namespace/tracker.clj
@@ -30,8 +30,32 @@
    :load ()})

 (defn add
-  "Depmap is a map from a namespace name to the set of names of
-  namespaces it depends on."
+  "Returns an updated dependency tracker with new/updated namespaces.
+
+  Depmap is a map describing the new or modified namespaces. Keys in
+  the map are namespace names (symbols). Values in the map are sets of
+  symbols naming the birect dependencies of each namespace. For
+  example, assuming these ns declarations:
+
+      (ns alpha (:require beta))
+      (ns beta (:require gamma delta))
+
+  the depmap would look like this:
+
+      {alpha #{beta}
+       beta  #{gamma delta}}
+
+  After adding new/updated namespaces, the dependency tracker will
+  have two lists:
+
+      :unload is the list of namespaces that need to be removed
+
+      :load is the list of namespaces that need to be reloaded
+
+  To reload namespaces in the correct order, first remove/unload all
+  namespaces in the :unload list, then (re)load all namespaces in
+  the :load list.
+"
   [state depmap]
   (let [{:keys [load unload deps nsmap]} state
         new-deps (update-deps deps depmap)
@@ -46,9 +70,8 @@
                      load)))))

 (defn add-files
-  "Reads ns declarations from files; returns an updated dependency
-  tracker indicating which namespaces need to be reloaded after files
-  were added."
+  "Reads ns declarations from files and adds them to the dependency
+  tracker."
   [state files]
   (let [{:keys [depmap filemap]}
         (reduce (fn [m file]
@@ -65,6 +88,10 @@
         (update-in [:filemap] (fnil merge {}) filemap))))

 (defn remove-names
+  "Returns an updated dependency tracker from which the namespaces
+  (symbols) have been removed. The :unload and :load lists indicate
+  the order in which namespaces should be un/reloaded to reflect this
+  change, as with add."
   [state names]
   (let [{:keys [load unload deps]} state
         known (set (dep/keys deps))
@@ -82,8 +109,9 @@
                              load))))))

 (defn remove-files
-  "Returns an updated dependency tracker indicating which namespaces
-  need to be reloaded after files were removed."
+  "Returns an updated dependency tracker after removing files. The
+  files must have been previously added to the dependency tracker
+  using add-files."
   [state files]
   (-> state
       (remove-names (keep (:filemap state {}) files))
@@ -96,9 +124,9 @@
   (dosync (alter @#'clojure.core/*loaded-libs* disj lib)))

 (defn reload-one
-  "Executes one unload/reload operation; returns updated dependency
-  tracker indicating errors and which namespaces remain to be
-  removed/reloaded."
+  "Executes the next pending unload/reload operation in the dependency
+  tracker. Returns the updated dependency tracker. If reloading caused
+  an error, it is captured as :error."
   [state]
   (let [{:keys [unload load]} state]
     (cond
@@ -118,8 +146,8 @@
         state)))

 (defn reload
-  "Executes remove/reload operations on a dependency tracker until
-  either an error is encountered or there are no more pending
+  "Executes all pending unload/reload operations on dependency tracker
+  until either an error is encountered or there are no more pending
   operations."
   [state]
   (loop [state (dissoc state :error)]


Add polling solution for MIDI changes.

Add polling solution for MIDI changes.

When CoreMIDI4J is not available, fall back to a thread which
periodically polls for changes in the MIDI environment.

--- src/afterglow/midi.clj
+++ src/afterglow/midi.clj
@@ -342,14 +342,14 @@
     (catch Throwable t
       (timbre/error t "Problem adding MIDI environment change to queue"))))

-(declare start-handoff-thread)
+(declare ensure-threads-running)

 (defn open-inputs-if-needed!
   "Make sure the MIDI input ports are open and ready to distribute events.
   Returns the `:midi-device` maps returned by `overtone.midi`
   representing the opened inputs."
   []
-  (swap! midi-transfer-thread start-handoff-thread)
+  (ensure-threads-running)
   (doseq [input (filter (create-midi-port-filter) (midi/midi-sources))]
     (when-not (get @midi-inputs (:device input))
       (let [connected (connect-midi-in input)]
@@ -362,7 +362,7 @@
   Returns the `:midi-device` maps returned by `overtone.midi`
   representing the opened outputs."
   []
-  (swap! midi-transfer-thread start-handoff-thread)
+  (ensure-threads-running)
   (doseq [output (filter (create-midi-port-filter) (midi/midi-sinks))]
     (when-not (get @midi-outputs (:device output))
       (let [connected (connect-midi-out output)]
@@ -399,13 +399,16 @@
     (.close device))
   (timbre/info "Lost contact with MIDI output: " vanished))

-(defn- handle-environment-changed
-  "Called when we had an event posted to the MIDI event queue telling
-  us that the environment has changed, i.e. a device has been added or
-  removed. Update our notion of the environment state accordingly."
-  []
-  (timbre/info "MIDI Environment changed!")
-
+(defn scan-midi-environment
+  "Called either periodically to check for changes, or, if CoreMidi4J
+  is installed, proactively in response to a reported change in the
+  MIDI environment. Updates our notion of what MIDI devices are
+  available, and notifies registered listeners of any changes.
+
+  Also sets up the thread used to process incoming MIDI events if that
+  is not already running, and arranges for this function to be called
+  as needed to keep up with future changes in the MIDI environment."
+  []
   ;; Clean up devices which are no longer present, notifying registered listeners of their departure.
   (let [f (create-midi-port-filter)]
     (doseq [device (clojure.set/difference (set (keys @midi-inputs))
@@ -422,6 +425,14 @@
   ;; Open and configure any newly available devices.
   (open-inputs-if-needed!)
   (open-outputs-if-needed!))
+
+(defn- handle-environment-changed
+  "Called when we had an event posted to the MIDI event queue telling
+  us that the environment has changed, i.e. a device has been added or
+  removed. Update our notion of the environment state accordingly."
+  []
+  (timbre/info "MIDI Environment changed!")
+  (scan-midi-environment))

 (defn- delegated-message-handler
   "Takes incoming MIDI events from the incoming queue on a thread with
@@ -449,7 +460,7 @@
                     (reset! running false)
                     (reset! midi-transfer-thread nil))
                   (catch Throwable t
-                    (timbre/error t "Problem runing global MIDI event handler")))))
+                    (timbre/error t "Problem running global MIDI event handler.")))))

             ;; Then call any registered port listeners for the port on which
             ;; it arrived
@@ -487,21 +498,74 @@
       (when @running (recur (.take midi-queue))))))

 (defn- start-handoff-thread
-  "Creates the thread used to deliver MIDI events when needed. Also
-  checks whether [CoreMIDI4J](https://github.com/DerekCook/CoreMidi4J)
-  is installed, and if so, registers our notification handler to let
-  us know when the MIDI environment changes."
+  "Creates the thread used to deliver MIDI events when needed."
   [old-thread]
   (or old-thread
-      (do
-        (when (clojure.reflect/resolve-class (.getContextClassLoader (Thread/currentThread))
-                                             'uk.co.xfactorylibrarians.coremidi4j.CoreMidiNotification)
-          (require '[afterglow.coremidi4j])
-          ((resolve 'afterglow.coremidi4j/add-environment-change-handler) environment-changed))
-        ;; TODO: Start polling-based environment-change notification system otherwise!
-        (doto (Thread. delegated-message-handler "MIDI event handoff")
+      (doto (Thread. delegated-message-handler "MIDI event handoff")
+        (.setDaemon true)
+        (.start))))
+
+(defonce ^{:doc "How often should we scan for changes in the MIDI
+  environment (devices that have been disconnected, or new devices
+  which have connected). This is used only
+  when [CoreMIDI4J](https://github.com/DerekCook/CoreMidi4J) is not
+  installed, sine CoreMIDI4J gives us proactive notification of
+  changes to the MIDI environment. The value is in milliseconds, so
+  the default means to check every two seconds. Changes to this value
+  will take effect after the next scan completes."}
+  scan-interval (atom  2000))
+
+(defonce ^:private ^{:doc "The thread, if any, which periodically
+  checks for changes in the MIDI environment when CoreMIDI4J is not
+  installed to let us know about them proactively. If CoreMIDI4J is in
+  use, this will be set to `:environment-changed` rather than an
+  actual thread, since none need be created."}
+  scan-thread (atom nil))
+
+(defn- periodic-scan-handler
+  "Rescans the MIDI environment at intervals defined
+  by [[scan-interval]]. Used when CoreMIDI4J is not installed to
+  arrange for such scans to happen when the environment actually has
+  changed."
+  []
+  (let [running (atom true)]
+    (loop []
+      (try
+        (Thread/sleep @scan-interval)
+        (scan-midi-environment)
+        (catch InterruptedException e
+          (timbre/info "MIDI periodic MIDI environment scan thread interrupted, shutting down.")
+          (reset! running false)
+          (reset! scan-thread nil))
+        (catch Throwable t
+          (timbre/error t "Problem running periodic MIDI scan thread.")))
+      ;; If we have not been shut down, do it all again.
+      (when @running (recur)))))
+
+(defn- start-scan-thread
+  "If there is no existing value in `old-thread`, Checks
+  whether [CoreMIDI4J](https://github.com/DerekCook/CoreMidi4J) is
+  installed, and if so, registers our notification handler to let us
+  know when the MIDI environment changes, and returns the value
+  `:environment-changed`. Otherwise creates, starts, and returns a
+  thread to periodically scan for such changes."
+  [old-thread]
+  (or old-thread
+      (if (clojure.reflect/resolve-class (.getContextClassLoader (Thread/currentThread))
+                                         'uk.co.xfactorylibrarians.coremidi4j.CoreMidiNotification)
+        (do (require '[afterglow.coremidi4j])  ; Can use proactive change notification
+            ((resolve 'afterglow.coremidi4j/add-environment-change-handler) environment-changed)
+            :environment-changed)
+        (doto (Thread. periodic-scan-handler "MIDI environment change scanner")  ; Need to poll
           (.setDaemon true)
           (.start)))))
+
+(defn- ensure-threads-running
+  "Starts the threads needed by the afterglow MIDI implementation, if
+  they are not already running."
+  []
+  (swap! midi-transfer-thread start-handoff-thread)
+  (swap! scan-thread start-scan-thread))

 (defn- tap-handler
   "Called when a tap tempo event has occurred for a tap tempo handler


Demonstrate difference between beta-eq? and clojure.core/=

--- test/latte/simple_types.clj
+++ test/latte/simple_types.clj
@@ -19,26 +19,35 @@
 (deftest basic-terms
   ;; Examples 2.2.6
   ;; (1) When x has type σ, then the identity function λx . x has type σ → σ
-  (is (beta-eq? (type-of [sigma :type] (lambda [x sigma] x)) ; (Π [x sigma] sigma)
-                (term [sigma :type] (==> sigma sigma))       ; (Π [⇧ sigma] sigma)
-                ))
+  (let [;; (Π [x sigma] sigma)
+        type-of-result (type-of [sigma :type] (lambda [x sigma] x))
+        ;; (Π [⇧ sigma] sigma)
+        term-result    (term [sigma :type] (==> sigma sigma))]
+    (is (and (is (beta-eq? type-of-result term-result))
+             ;; "normal" non-equality from clojure.core
+             (is (not=     type-of-result term-result)))))

-  (is (type-check? [sigma :type] (lambda [x sigma] x)
-                   (==> sigma sigma)))
+  (is (true? (type-check? [sigma :type] (lambda [x sigma] x)
+                          (==> sigma sigma))))

-  (is (beta-eq? (type-of [sigma :type]
-                         [tau :type]
-                         [y (==> sigma tau)]
-                         [x sigma]
-                         (y x))      ; tau
-                'tau                 ; tau
-                ))
+  (let [type-of-result (type-of [sigma :type]
+                                [tau :type]
+                                [y (==> sigma tau)]
+                                [x sigma]
+                                (y x))
+        term-result 'tau]
+    (is (and (is (beta-eq? type-of-result term-result))
+             ;; "normal" equality from clojure.core
+             (is (=        type-of-result term-result)))))

-  (is (beta-eq? (type-of [alpha :type] [beta :type] [gamma :type]
-                         [x (==> alpha alpha)]
-                         [y (==> (==> alpha alpha) beta)]
-                         (lambda [u gamma] (y x)))   ; (Π [u gamma] beta)
-                   (term [beta :type] [gamma :type]
-                         (==> gamma beta))           ; (Π [⇧ gamma] beta)
-                   ))
+  (let [;; (Π [u gamma] beta)
+        type-of-result (type-of [alpha :type] [beta :type] [gamma :type]
+                                [x (==> alpha alpha)]
+                                [y (==> (==> alpha alpha) beta)]
+                                (lambda [u gamma] (y x)))
+        ;; (Π [⇧ gamma] beta)
+        term-result    (term [beta :type] [gamma :type] (==> gamma beta))]
+    (is (and (is (beta-eq? type-of-result term-result))
+             ;; "normal" non-equality from clojure.core
+             (is (not=     type-of-result term-result)))))
   )


add documentation

add documentation

--- src/babel/lexicon.cljc
+++ src/babel/lexicon.cljc
@@ -1,7 +1,17 @@
 (ns babel.lexicon)

+;; mapping of predicates: e.g. :say, to lexical implications.
+;; e.g., if verb is :say, then :subj (i.e. the speaker) must
+;; be human, and :obj (i.e. what is spoken) must be speakable.
+;; TODO: consider simplifying this by stipulating that the
+;; constraint applies only to {:sem ...},
+;; not {:synsem { .. :sem .. }}.
 (def universals
   {:say {:synsem {:sem {:subj {:human true}
                         :obj {:speakable true}}}}
    :tell {:synsem {:sem {:subj {:human true}
                          :obj {:human true}}}}})
+
+;; TODO: add other :pred -> constraints, and
+;; DRY stuff up by removing the same from language-specific lexicons,
+;; where it's present


Test needed to change because of issue 26

--- test/behaviors/t_setup_teardown.clj
+++ test/behaviors/t_setup_teardown.clj
@@ -49,7 +49,7 @@

 (after-silently
  (fact "background wrapping establishes a lexical binding"
-   (against-background (around :checks (let [x 1] ?form))
+   (against-background (around :facts (let [x 1] ?form))
                        (f x) => 2 )
    (+ (f x) 2) => 4)
  (fact (only-passes? 1) => truthy))


Add a test

Add a test

--- test/oi_lang/obj_tests.cljs
+++ test/oi_lang/obj_tests.cljs
@@ -27,4 +27,5 @@

 (deftest simple-eval-tests
   (is (oi/oi-= (oi/eval* (oi/ast->runtime* (oi/parse "42"))) (oi/oi-number 42)))
-  (is (oi/oi-= (oi/eval* (oi/ast->runtime* (oi/parse "list(1, 2, 3); 42"))) (oi/oi-number 42))))
+  (is (oi/oi-= (oi/eval* (oi/ast->runtime* (oi/parse "list(1, 2, 3); 42"))) (oi/oi-number 42)))
+  (is (oi/oi-= (oi/eval* (oi/ast->runtime* (oi/parse "list(1, 2, 3); 2<42"))) oi/oi-true)))


making the assertion to check if a build is parallel more fuzzy to make sure it's not randomly failing the build on travis

--- test/lambdacd/control_flow_test.clj
+++ test/lambdacd/control_flow_test.clj
@@ -39,7 +39,7 @@
   (testing "that one failing step fails the pipeline"
     (is (= {:outputs { [1 0 0] {:status :success} [2 0 0] {:status :failure}} :status :failure} ((in-parallel some-successful-step some-failing-step) {} {:step-id [0 0]}))))
   (testing "that it executes things faster than it would serially"
-    (is (close? 30 100 (my-time ((in-parallel some-step-taking-100ms some-step-taking-100ms some-step-taking-100ms) {} {:step-id [0 0]}))))))
+    (is (close? 100 100 (my-time ((in-parallel some-step-taking-100ms some-step-taking-100ms some-step-taking-100ms) {} {:step-id [0 0]}))))))

 (deftest in-cwd-test
   (testing "that it collects all the outputs together correctly and passes cwd to steps"


Remove js/COMPILED in process-require node tests

--- test/node/replumb/require_test.cljs
+++ test/node/replumb/require_test.cljs
@@ -17,11 +17,11 @@
 (nodejs/enable-util-print!)

 (deftest process-require
-  ;; Damian - Add COMPILED flag to cljs eval to turn off namespace already declared errors
-  ;; AR - COMPILED goes here not in the runner otherwise node does not execute doo tests
-  (set! js/COMPILED true)
-  (let [target-opts (merge (nodejs-options test-paths io/read-file!)
-                           {:verbose true})]
+  ;; Damian - Add js/COMPILED flag to cljs eval to turn off namespace already declared errors
+  ;; AR - js/COMPILED goes here not in the runner otherwise node does not execute doo tests
+  ;; AR - js/COMPILED is not needed after having correctly bootstrapped the
+  ;; nodejs environment, see PR #57
+  (let [target-opts (nodejs-options test-paths io/read-file!)]
     ;; AR - Test for "No *load-fn* when requiring a namespace in browser #35"
     ;; Note there these are tests with a real *load-fn*
     (let [res (repl/read-eval-call target-opts validated-echo-cb "(require 'foo.bar.baz)")
@@ -31,5 +31,4 @@
       (is (valid-eval-result? out) "(require 'foo.bar.baz) should be a valid result")
       (is (= 'cljs.user (repl/current-ns)) "(require 'foo.bar.baz) should not change namespace")
       (is (= "nil" out) "(require 'foo.bar.baz) should return \"nil\"")
-      (repl/reset-env! ['foo.bar.baz])))
-  (set! js/COMPILED false))
+      (repl/reset-env! ['foo.bar.baz]))))


illegal chars that makes load buffer abort in cider

--- src/adventofcode1/four.clj
+++ src/adventofcode1/four.clj
@@ -186,8 +186,8 @@
 ;;
 ;; (map #(do (println %)(apply rotate-char %)) (gen/sample (s/gen (:args (s/get-spec #'rotate-char))) 3))
 ;; (> 0)
-;; ( 0)
-;; ( 0)
-;; (\> \g \)
+;; (a 0)
+;; (a 0)
+;; (\> \g \a)

 #_(clojure.spec.test/instrument)


Comment

Comment

--- src/adzerk/boot_reload.clj
+++ src/adzerk/boot_reload.clj
@@ -183,6 +183,8 @@
             ; Only send changed files when there are no warnings
             ; As prev is updated only when changes are sent, changes are queued untill they can be sent
             (when (empty? warnings)
+              ;; IDEA: asset-path & cljs-asset-path could be handed in the client side and
+              ;; they would only need to be written to client cljs. Would allow different options for each build.
               (send-changed! @pod
                              asset-path
                              cljs-asset-path


Make held feedback visible on example strobe cues.

Change the color of the strobe example cues from white to purple, so you
can cee the lightening feedback Afterglow gives you to indicate that
they last only as long as you hold them down.

--- src/afterglow/examples.clj
+++ src/afterglow/examples.clj
@@ -308,11 +308,12 @@
   (ct/set-cue! (:cue-grid *show*) x y
                (cues/cue (keyword (str "strobe-" (clojure.string/replace (clojure.string/lower-case name) " " "-")))
                          (fn [var-map] (fun/strobe (str "Strobe " name) fixtures (:level var-map 50)))
-                           :held true
-                           :priority 100
-                           :variables [{:key "level" :min 0 :max 100 :start 50 :name "Level"
-                                        :aftertouch true :aftertouch-min 25}
-                                       {:key :strobe-lightness :min 0 :max 100 :name "Lightness" :aftertouch true}])))
+                         :color :purple
+                         :held true
+                         :priority 100
+                         :variables [{:key "level" :min 0 :max 100 :start 50 :name "Level"
+                                      :aftertouch true :aftertouch-min 25}
+                                     {:key :strobe-lightness :min 0 :max 100 :name "Lightness" :aftertouch true}])))

 (defn x-phase
   "Return a value that ranges from zero for the leftmost fixture in a
@@ -579,7 +580,7 @@
                            (fn [_] (dimmer-effect
                                     (params/build-oscillated-param (oscillators/triangle-bar) :min 1)
                                     (show/all-fixtures) :effect-name "All Triangle Bar"))
-                           :color :purple :end-keys [:torrent-dimmers :blade-dimmers :ws-dimmers
+                           :color :red :end-keys [:torrent-dimmers :blade-dimmers :ws-dimmers
                                                    :puck-dimmers :hex-dimmers :snowball-dimmers]))

     ;; Strobe cues
@@ -592,6 +593,7 @@

     (ct/set-cue! (:cue-grid *show*) 7 6
                  (cues/cue :adjust-strobe (fn [_] (fun/adjust-strobe))
+                           :color :purple
                            :variables [{:key :strobe-hue :min 0 :max 360 :name "Hue" :centered true}
                                        {:key :strobe-saturation :min 0 :max 100 :name "Saturatn"}]))


Add 3 and 4 color pinstripe chases.

Add 3 and 4 color pinstripe chases.


Update the test suite for response newlines.

--- test/shale/test/handler.clj
+++ test/shale/test/handler.clj
@@ -59,13 +59,13 @@
     (let [app (:ring-app (:app system))
           response (app (mock/request :get "/sessions"))]
       (is-200 response)
-      (is-body response "[]")))
+      (is-body response "[]\n")))

   (testing "nodes route"
     (let [app (:ring-app (:app system))
           response (app (mock/request :get "/nodes"))]
       (is-200 response)
-      (is-body response "[]"))))
+      (is-body response "[]\n"))))

 (defn refresh-nodes [app]
   (app (mock/request :post "/nodes/refresh")))
@@ -79,7 +79,7 @@
       (doto resp-1
         (is-200)
         (is-json)
-        (is-body "[]"))
+        (is-body "[]\n"))
       (doto resp-refresh
         (is-status 201)
         (is-body nil))


Complain on msg-put failure.

Complain on msg-put failure.

--- src/cbfg/act-misc.cljs
+++ src/cbfg/act-misc.cljs
@@ -16,7 +16,8 @@
   (act msg-req actx (areq msg-req (ch-key m) m)))

 (defn msg-put [actx ch-key m]
-  (act msg-put actx (aput msg-put (ch-key m) m)))
+  (act msg-put actx (when (not (aput msg-put (ch-key m) m))
+                      (println "failed msg-put" ch-key m))))

 (defn msg-put-res [actx ch-key m]
   (let [res-ch (achan actx)]


Started coll-ch in make-coll.

Started coll-ch in make-coll.

--- src/cbfg/world/t2.cljs
+++ src/cbfg/world/t2.cljs
@@ -40,23 +40,24 @@

 ; TODO: Split between logical schema and physical runtime objects.

-(defn make-coll [actx rev m]
+(defn make-coll [actx rev name]
+  ; TODO: Worker loop for coll-ch.
   {:rev rev
-   :name (:key m)})
+   :name name
+   :coll-ch (achan actx)})

 (defn make-initial-server-state [actx]
-  {:rev 0
-   :realms {"_system" {:rev 0
-                       :users {"admin" {:rev 0
-                                        :pswd "password"}}
-                       :collsets {}}
-            "_lobby" {:rev 0
-                      :users {"_anon" {:rev 0
-                                       :pswd ""}}
-                      :collsets {"default" {:rev 0
-                                            :colls {"default" {:rev 0
-                                                               :name "default"}
-                                                    }}}}}})
+  (let [c (make-coll actx 0 "default")]
+    {:rev 0
+     :realms {"_system" {:rev 0
+                         :users {"admin" {:rev 0
+                                          :pswd "password"}}
+                         :collsets {}}
+              "_lobby" {:rev 0
+                        :users {"_anon" {:rev 0
+                                         :pswd ""}}
+                        :collsets {"default" {:rev 0
+                                              :colls {"default" c}}}}}}))

 (def initial-lane-state
   {:cur-realm "_lobby"
@@ -121,7 +122,7 @@
                                              :colls])]
           (if (not (get (:key m) colls))
             (let [nrev (inc (:rev server-state))
-                  coll (make-coll actx nrev m)]
+                  coll (make-coll actx nrev (:key m))]
               [(-> server-state
                    (assoc-in [:realms (:cur-realm m)
                               :collsets (:cur-realm-collset m)
@@ -147,6 +148,7 @@
     :update-user-realm
     (if (or (= (:user-realm m) (:realm m))
             (= (:user-realm m) "_system"))
+      ; TODO: Don't let user switch to nonexistent coll.
       [(assoc lane-state
          :cur-realm (:realm m)
          :cur-realm-collset (:realm-collset m)


Add helper for building KeyValueMappers

Add helper for building KeyValueMappers

--- src/cddr/ksml/eval.clj
+++ src/cddr/ksml/eval.clj
@@ -49,10 +49,16 @@
 ;;

 (defn predicate
-  [f]
+  [pred-fn]
   (reify Predicate
     (test [_ k v]
-      (boolean (f k v)))))
+      (boolean (pred-fn k v)))))
+
+(defn key-value-mapper
+  [map-fn]
+  (reify KeyValueMapper
+    (apply [_ k v]
+      (apply key-value (map-fn k v)))))

 ;; kstream/ktable ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
@@ -80,9 +86,7 @@
 (defmethod eval-op :flat-map
   [_ map-fn stream-or-table]
   `(.. ~(eval stream-or-table)
-       (flatMap (reify KeyValueMapper
-                  (apply [_ k# v#]
-                    (apply key-value (~map-fn k# v#)))))))
+       (flatMap (key-value-mapper map-fn))))

 (defmethod eval-op :flat-map-values
   [_ map-fn stream-or-table]
@@ -102,18 +106,14 @@
   [_ group-fn stream & args]
   `(.. ~(eval stream)
        ~(remove nil? (list 'groupBy
-                           `(reify KeyValueMapper
-                              (apply [_ k# v#]
-                                (apply key-value (~group-fn k# v#))))
+                           `(key-value-map-fn ~group-fn)
                            args))))

 (defmethod eval-op :group-by-key
   [_ group-fn stream & args]
   `(.. ~(eval stream)
        ~(remove nil? (list 'groupByKey
-                            `(reify KeyValueMapper
-                               (apply [_ k# v#]
-                                 (apply key-value (~group-fn k# v#))))
+                            `(key-value-map-fn ~group-fn)
                             args))))

 (defmethod eval-op :join
@@ -130,9 +130,7 @@
   [_ join-fn map-fn left right]
   `(.. ~(eval left)
        (join ~(eval right)
-             `(reify KeyValueMapper
-                (apply [_ k# v#]
-                  (~map-fn k# v#)))
+             `(key-value-map-fn ~map-fn)
              `(reify ValueJoiner
                 (apply [_ left# right#]
                   (~join-fn left# right#))))))
@@ -151,9 +149,7 @@
   [_ join-fn map-fn left right]
   `(.. ~(eval left)
        (join ~(eval right)
-             `(reify KeyValueMapper
-                (apply [_ k# v#]
-                  (~map-fn k# v#)))
+             `(key-value-mapper ~map-fn)
              `(reify ValueJoiner
                 (apply [_ left# right#]
                   (~join-fn left# right#))))))
@@ -161,9 +157,7 @@
 (defmethod eval-op :map
   [_ map-fn stream]
   `(.. ~(eval stream)
-       (map (reify KeyValueMapper
-              (apply [_ k# v#]
-                (apply key-value (~map-fn k# v#)))))))
+       (map (key-value-mapper ~map-fn))))

 (defmethod eval-op :map-values
   [_ map-fn stream]
@@ -222,9 +216,7 @@
 (defmethod eval-op :select-key
   [_ map-fn stream]
   `(.. ~(eval stream)
-       (selectKey (reify KeyValueMapper
-                    (apply [_ k v]
-                      (apply key-value (~map-fn k# v#)))))))
+       (selectKey (key-value-mapper ~map-fn))))

 (defmethod eval-op :through
   [_ stream & args]


Add helper for building TransformerSuppliers

--- src/cddr/ksml/eval.clj
+++ src/cddr/ksml/eval.clj
@@ -95,6 +95,22 @@
            (process [_ k v]
              (process-fn @ctx k v))))))))

+(defn transformer-supplier
+  ([transform-fn]
+   (transformer-supplier transform-fn (constantly nil)))
+
+  ([transform-fn punctuate-fn]
+   (reify TransformerSupplier
+     (get [_]
+       (let [ctx (atom nil)]
+         (reify Transformer
+           (init [_ context]
+             (reset! ctx context))
+           (punctuate [_ ts]
+             (punctuate-fn @ctx ts))
+           (transform [_ k v]
+             (transform-fn @ctx k v))))))))
+
 ;; kstream/ktable ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Lots of methods exist on both KStream and KTable classes. Clojure
@@ -232,28 +248,12 @@
 (defmethod eval-op :transform
   ([_ transform-fn stream state-stores]
    `(.. ~(eval stream)
-        (transform `(reify TransformerSupplier
-                      (get [this]
-                        (let [ctx# (atom nil)]
-                          (reify TransformerSupplier
-                            (init [this context]
-                              (reset! ctx# context))
-                            (transform [this k v]
-                              (~transform-fn @ctx# k v))))))
+        (transform `(transformer-supplier ~transform)
                    (into-array String state-stores))))

   ([_ transform-fn punctuate-fn stream state-stores]
    `(.. ~(eval stream)
-        (transform `(reify TransformerSupplier
-                      (get [this]
-                        (let [ctx# (atom nil)]
-                          (reify TransformerSupplier
-                            (init [this context]
-                              (reset! ctx# context))
-                            (punctuate [this timestamp]
-                              (~punctuate-fn @ctx# timestamp))
-                            (transform [this k v]
-                              (~transform-fn @ctx# k v))))))
+        (transform `(transformer-supplier ~transform-fn ~punctuate-fn)
                    (into-array String state-stores)))))

 (defmethod eval-op :to!


Remove nils from data before storing it

Remove nils from data before storing it

--- src/cfpb/qu/loader.clj
+++ src/cfpb/qu/loader.clj
@@ -82,7 +82,8 @@
   (->num value))

 (defmethod cast-value "dollars" [value _]
-  (->num (str/replace value #"^\$(-?\d+)" "$1")))
+  (when-not (str/blank? value)
+    (->num (str/replace value #"^\$(-?\d+)" "$1"))))

 (defmethod cast-value "boolean" [value _]
   (cond
@@ -91,13 +92,15 @@
    :default true))

 (defmethod cast-value "date" [value {:keys [format]}]
-  (if format
-    (time/parse (time/formatter format) value)
-    (time/parse default-date-parser value)))
+  (cond
+   (str/blank? value) nil
+   format (time/parse (time/formatter format) value)
+   :default (time/parse default-date-parser value)))

 (defmethod cast-value "lookup" [value {:keys [lookup]}]
-  ;; Have to call keyword on value because Cheshire turns keys into keywords
-  (lookup (keyword value)))
+  ;; Have to call keyword on value because Cheshire turns keys into keywords
+  (when-not (str/blank? value)
+    (lookup (keyword value))))

 (defmethod cast-value :default [value _]
   value)
@@ -110,7 +113,8 @@
         (r/remove nil?
                   (r/map (fn [[column value]]
                            (let [cdef (columns column)]
-                             (when (and (seq cdef) (not (:skip cdef)))
+                             (when-not (or (nil? cdef)
+                                           (:skip cdef))
                                [(keyword (or (:name cdef) column))
                                 (cast-value value cdef)]))) data))))

@@ -190,12 +194,17 @@
                                data references))
         transform-keys (if keyfn
                          (partial map #(convert-keys % keyfn))
-                         identity)]
+                         identity)
+        remove-nils (fn [data]
+                      (map
+                       (fn [row]
+                         (into {} (remove (fn [[k v]] (nil? v)) row)))
+                       data))]
     (doseq [file sources]
       (load-csv-file
        (str dir "/" file)
        collection
-       (comp transform-keys add-concepts cast-data)))))
+       (comp remove-nils transform-keys add-concepts cast-data)))))

 (defmulti load-slice
   (fn [slice _ definition]


green

green

--- src/cloogling/core.clj
+++ src/cloogling/core.clj
@@ -1,11 +1,11 @@
 (ns cloogling.core
   (:require [clojure.data.json :as json]))

-(defrecord entry [url])
+(defrecord entry [url title])

 (defn get-entries
   "Get results from json data retrieved from engine"
   [x]
-  (map (fn [x] (->entry (x "Url" ))) (-> x
+  (map (fn [x] (->entry (x "Url" ) (x "Title"))) (-> x
                                          json/read-str
                                          (get-in ["d" "results"]))))


added advertir

added advertir

--- src/babel/espanol/lexicon.clj
+++ src/babel/espanol/lexicon.clj
@@ -27,6 +27,11 @@
    "acompañar" {:synsem {:cat :verb
                          :sem {:pred :accompany}}}

+   "advertir" {:espanol {:boot-stem1 "adviert"
+                        :boot-stem2 "advert"}
+             :synsem {:cat :verb
+                      :sem {:pred :warn}}}
+
    "anunciar" {:synsem {:cat :verb
                         :sem {:pred :announce}}}


added caer

added caer

--- src/babel/espanol/lexicon.clj
+++ src/babel/espanol/lexicon.clj
@@ -155,7 +155,15 @@
                       :preterito-stem "cup"}
             :synsem {:cat :verb
                      :sem {:pred :fit}}}
-   "caer" {}
+   "caer" {:espanol  {:present {:1sing "caigo"}
+                     :preterito {:1sing "caì"
+                                 :2sing "caiste"
+                                 :3sing "cayò"
+                                 :1plur "caimos"
+                                 :2plur "caisteis"
+                                 :3plur "cayeron"}}
+            :synsem {:cat :verb
+                      :sem {:pred :fall}}}

    "cambiar" {:synsem {:cat :verb
                        :sem {:pred :change}}}


updated rule name

updated rule name

--- kabob-build/src/main/resources/edu/ucdenver/ccp/kabob/build/rules/temp/irefweb/temp/binary.clj
+++ kabob-build/src/main/resources/edu/ucdenver/ccp/kabob/build/rules/temp/irefweb/temp/binary.clj
@@ -1,4 +1,4 @@
-`{:name "irefweb-binary-interactions"
+`{:name "irefweb-binary-interactions-tmp"
   :description ""
   :head ((?/interaction rdfs/subClassOf ?/int_type_id) ;interaction


Fix calculating map size.

Fix calculating map size.

--- src/constraint/core.cljs
+++ src/constraint/core.cljs
@@ -169,7 +169,10 @@

 (defn map-size [{:keys [vertices]}]
-  (map + [50 50] (apply (comp max (partial map vector)) vertices)))
+  (->> vertices
+       (map second)
+       (apply map max)
+       (map + [50 50])))

 (defn draw-world [world-state]


Remember the initial state

Remember the initial state

--- src/constraint/core.cljs
+++ src/constraint/core.cljs
@@ -152,11 +152,25 @@
   (dommy/listen! (dommy.core/sel1 :#randomrange) :change
                  change-interval))

+(defn remember-initial-state
+  [world-state]
+  (merge world-state {:initial world-state}))
+
+
+(defn parse-state
+  [state]
+  (->>
+   state
+   reader/read-string
+   reset-edit
+   reset-random
+   remember-initial-state))
+
 (go
   (listen-on-slider-change)
-  (let [read-state (reader/read-string (<! (GET "./state.edn")))]
+  (let [read-state (parse-state (<! (GET "./state.edn")))]
     (big-bang!
-      :initial-state (->> read-state reset-edit reset-random)
+      :initial-state read-state
       :to-draw draw-world
       :on-tick random-move
       :on-click update-state)))


Fix a date handling bug

Fix a date handling bug

This is a change that should have been in
c729a27b5a5da89fc32b9d716a5b7817168c3b10 when all date handling was
moved to java.util.Date

--- src/catalog/layout/dtbook.clj
+++ src/catalog/layout/dtbook.clj
@@ -76,7 +76,7 @@
           {:dc:Title title
            :dc:Creator creator
            :dc:Publisher creator
-           :dc:Date (time.format/unparse (time.format/formatters :date) date)
+           :dc:Date (time.format/unparse (time.format/formatters :date) (time.coerce/from-date date))
            :dc:Format "ANSI/NISO Z39.86-2005"
            :dc:Language language}]
       [:meta {:name (name k) :content v}])]


make code buildable

make code buildable

Signed-off-by: Yen-Chin Lee <082d453d72dce940e12089a4ad48b97cfe1f3ec4@gmail.com>

--- src/clj/brains_brain/core.clj
+++ src/clj/brains_brain/core.clj
@@ -7,6 +7,7 @@
   (:refer-clojure :exclude [make-array])
   (:gen-class))

+;; native ui
 (native!)

 ;; cell size
@@ -22,90 +23,10 @@
         (* (- cell-size 1)
            (- board-size cell-size)))))

-;; We can use clojure's `make-array' create 2d array, but we do our own here
-;; and convert to array object
-(defn make-array
-  "Create 2d-array object."
-  ([width height] (make-array width height 0))
-  ([width height init-val]
-   (to-array-2d
-    (partition width (repeat (* width height) init-val)))))
-
-(defn make-board
-  "Create board with random initial value"
-  []
-  (let [board (make-array board-size board-size)]
-    (doseq [x (range 0 board-size)
-            y (range 0 board-size)]
-      (aset board x y (if (< (rand-int 100) 50) :off :on)))
-    board))
-
-(defn neighbors [[x y]]
-  (for [dx [-1 0 1]
-        dy (if (zero? dx)
-             [-1 1]
-             [-1 0 1])]
-    [(+ dx x) (+ dy y)]))
-
-
-(defn create-world
-  "Creates rectangular world with the specified width and height.
-  Optionally takes coordinates of living cells."
-  [w h & living-cells]
-  (vec (for [y (range w)]
-         (vec (for [x (range h)]
-                (if (contains? (first living-cells) [y x]) "X" " "))))))
-
-
-
-(defn create-world2
-  "Creates rectangular world with the specified width and height.
-  Optionally takes coordinates of living cells."
-  ([w h] (create-world2 w h #{}))
-  ([w h living-cells]
-   (for [y (range w)]
-     (for [x (range h)]
-       (if (contains? living-cells [y x]) :on :off)))))
-
-(def create-world
-  "Creates rectangular world with the specified width and height.
-  Optionally takes coordinates of living cells."
-  (fn self
-    ([w h] (self w h #{}))
-    ([w h living-cells]
-     (for [y (range w)]
-       (for [x (range h)]
-         (if (contains? living-cells [y x]) :on :off))))))
-
-
-(create-world2 4 4)
-(create-world2 4 4 #{[0 0], [1 1], [2 2], [3 3]})
-
-(first #{[0 0], [1 1], [2 2], [3 3]})
-(contains? #{[0 0], [1 1], [2 2], [3 3]} [ 1])
-
-(defn neighbours
-  "Determines all the neighbours of a given coordinate"
-  [[x y]]
-  (for [dx [-1 0 1] dy [-1 0 1] :when (not= 0 dx dy)]
-    [(+ dx x) (+ dy y)]))
-
-(neighbours [1 1])
-
-(frequencies (mapcat neighbors #{[1 1] [1 0]}))
-
-(def a (create-world2 4 4 #{[0 0], [1 1], [2 2], [3 3]}))
-
-(a [0 1])
-
-(def a (make-board))
-
-(mapcat neighbors a)
-
 (defn draw-grid [c g]
   (doseq [x (range 0 board-size)
           y (range 0 board-size)
-          :let [cell (aget a x y)
+          :let [cell (aget c x y)
                 xb (* x cell-size)
                 yb (* y cell-size)]]
     (draw g
@@ -133,7 +54,94 @@
                     :border 5)
           )))

-
 (defn -main [& args]
   (let [ui (make-ui)]
-    (-> ui pack! show!)))+    (-> ui pack! show!)))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+(comment
+
+  ;; We can use clojure's `make-array' create 2d array, but we do our own here
+  ;; and convert to array object
+  (defn make-array
+    "Create 2d-array object."
+    ([width height] (make-array width height 0))
+    ([width height init-val]
+     (to-array-2d
+      (partition width (repeat (* width height) init-val)))))
+
+  (defn make-board
+    "Create board with random initial value"
+    []
+    (let [board (make-array board-size board-size)]
+      (doseq [x (range 0 board-size)
+              y (range 0 board-size)]
+        (aset board x y (if (< (rand-int 100) 50) :off :on)))
+      board))
+
+  (defn neighbors [[x y]]
+    (for [dx [-1 0 1]
+          dy (if (zero? dx)
+               [-1 1]
+               [-1 0 1])]
+      [(+ dx x) (+ dy y)]))
+
+
+  (defn create-world
+    "Creates rectangular world with the specified width and height.
+  Optionally takes coordinates of living cells."
+    [w h & living-cells]
+    (vec (for [y (range w)]
+           (vec (for [x (range h)]
+                  (if (contains? (first living-cells) [y x]) "X" " "))))))
+
+
+
+  (defn create-world2
+    "Creates rectangular world with the specified width and height.
+  Optionally takes coordinates of living cells."
+    ([w h] (create-world2 w h #{}))
+    ([w h living-cells]
+     (for [y (range w)]
+       (for [x (range h)]
+         (if (contains? living-cells [y x]) :on :off)))))
+
+  (def create-world
+    "Creates rectangular world with the specified width and height.
+  Optionally takes coordinates of living cells."
+    (fn self
+      ([w h] (self w h #{}))
+      ([w h living-cells]
+       (for [y (range w)]
+         (for [x (range h)]
+           (if (contains? living-cells [y x]) :on :off))))))
+
+
+  (create-world2 4 4)
+  (create-world2 4 4 #{[0 0], [1 1], [2 2], [3 3]})
+
+  (first #{[0 0], [1 1], [2 2], [3 3]})
+  (contains? #{[0 0], [1 1], [2 2], [3 3]} [ 1])
+
+  (defn neighbours
+    "Determines all the neighbours of a given coordinate"
+    [[x y]]
+    (for [dx [-1 0 1] dy [-1 0 1] :when (not= 0 dx dy)]
+      [(+ dx x) (+ dy y)]))
+
+  (neighbours [1 1])
+
+  (frequencies (mapcat neighbors #{[1 1] [1 0]}))
+
+  (def a (create-world2 4 4 #{[0 0], [1 1], [2 2], [3 3]}))
+
+  ;; (a [0 1])
+
+  (def a (make-board))
+
+  (mapcat neighbors a)
+
+
+  )


Allow websocket to take request options

Allow websocket to take request options

--- src/clj/http/async/client.clj
+++ src/clj/http/async/client.clj
@@ -396,13 +396,15 @@
                           byte-cb  :byte
                           open-cb  :open
                           close-cb :close
-                          error-cb :error}]
+                          error-cb :error
+                          :as opts}]
   (let [b (WebSocketUpgradeHandler$Builder.)
         ws (atom nil)]
     (.addWebSocketListener b (ws-lifecycle-listener ws open-cb close-cb error-cb))
     (when text-cb (.addWebSocketListener b (create-ws-text-listener ws text-cb)))
     (when byte-cb (.addWebSocketListener b (create-ws-byte-listener ws byte-cb)))
-    (.get (.executeRequest client (prepare-request :get url) (.build b)))))
+    (.get (.executeRequest client (apply prepare-request :get url (apply concat opts)) (.build b)))))
+

 ;; closing
 (defprotocol IClosable


save move-in date as beginning of day in UTC time zone

--- src/clj/mapp/models/apply.clj
+++ src/clj/mapp/models/apply.clj
@@ -21,6 +21,7 @@
              [customer :as rcu]]
             [toolbelt
              [async :refer [<!!?]]
+             [date :as date]
              [predicates :as p]]))

 ;; =============================================================================
@@ -323,7 +324,7 @@

 (defmethod update-tx :logistics/move-in-date
   [_ {date :move-in-date} application _]
-  [[:db/add (:db/id application) :application/move-in (c/to-date date)]])
+  [[:db/add (:db/id application) :application/move-in (date/beginning-of-day (c/to-date date))]])

 (defmethod update-tx :logistics/pets


RR: fix dataset route

RR: fix dataset route

--- src/clj/ona/viewer/routes.clj
+++ src/clj/ona/viewer/routes.clj
@@ -17,18 +17,18 @@
   (POST "/login" {{:keys [username password]} :params} (accounts/submit-login username password))
   (GET "/logout" {{:keys [account]} :session} (accounts/logout account))
   (context "/:owner" [owner]
-    (GET "/temp-token"
-         {{:keys [account]} :session}
-      (accounts/get-token account owner))
-    (GET "/validate-token"
-         {{:keys [account]} :session}
-         (accounts/validate-token account owner))))
-  (defroutes dataset-routes
-             (context "/:dataset-id" [dataset-id]
-                    (GET "/"
-                         {{:keys [account]} :session}
-                         (datasets/dataview account
-                                            dataset-id))))
+           (GET "/temp-token"
+                {{:keys [account]} :session}
+                (accounts/get-token account owner))
+           (GET "/validate-token"
+                {{:keys [account]} :session}
+                (accounts/validate-token account owner))))
+
+(defroutes dataset-routes
+  (GET "/forms/:dataset-id"
+       {{:keys [account]} :session
+        {:keys [dataset-id]} :params}
+       (datasets/dataview account dataset-id)))

 (defroutes main-routes
   (GET "/" {{:keys [account]} :session} (home/dashboard account))
@@ -38,7 +38,7 @@

 (defroutes app-routes
   user-routes
-  ; dataset-routes
+  dataset-routes
   main-routes)

 (def ona-viewer


Factory badge updates, BRS fix

Factory badge updates, BRS fix

--- src/clj/salava/badge/main.clj
+++ src/clj/salava/badge/main.clj
@@ -152,12 +152,11 @@
   (let [obf-url (get-in ctx [:config :core :obf :url])
         site-url (get-in ctx [:config :core :site-url])]
     (if (string? obf-url)
-      (let [assertion-url (select-badge-assertion-url {:id user-badge-id :user_id user-id} (into {:result-set-fn first :row-fn :assertion_url} (u/get-db ctx)))]
-        (if (re-find (re-pattern obf-url) (str assertion-url))
-          (try+
-            (http/http-get (str obf-url "/c/badge/passport_update") {:query-params {"badge" user-badge-id "user" user-id "url" site-url}})
-            (catch Object _
-              (log/error "send-badge-info-to-obf: " _))))))))
+      (if-let [assertion-url (select-badge-assertion-url {:id user-badge-id :user_id user-id} (into {:result-set-fn first :row-fn :assertion_url} (u/get-db ctx)))]
+        (try+
+          (http/http-get (str obf-url "/c/badge/passport_update") {:query-params {"badge" user-badge-id "user" user-id "url" site-url}})
+          (catch Object _
+            (log/error "send-badge-info-to-obf: " _)))))))

 ;;EVIDENCE


send plain timestamp to factory

send plain timestamp to factory

--- src/clj/salava/factory/db.clj
+++ src/clj/salava/factory/db.clj
@@ -71,23 +71,23 @@
   "Conforms endorsment to specification: https://www.imsglobal.org/sites/default/files/Badges/OBv2p0Final/index.html#Endorsement
   Endorser profile link is used as issuer id"
   [ctx coll]
-  (map (fn [endorsement]
+  (mapv (fn [endorsement]
          (-> endorsement
-             (dissoc :content :endorser_id :assertion_url)
+             (dissoc :content :issuer_id :issuer_name :issuer_url :mtime :assertion_url)
              (assoc :issuer {:id (:issuer_url endorsement)
                              :name (:issuer_name endorsement)
                              :type "Issuer"}
                :claim {:id (:assertion_url endorsement)
                        :endorsementComment (:content endorsement)}
-               :issuedOn (str (l/to-local-date-time (long (* (:mtime endorsement) 1000))))))) coll))
+               :issuedOn (:mtime endorsement) #_(str (l/to-local-date-time (long (* (:mtime endorsement) 1000))))))) coll))

 (defn get-badge-updates
   ""
   [ctx user-id badge-id]
   (let [badge-updates (select-badge-updates {:user_id user-id :id badge-id} (u/get-db-1 ctx))
         evidence (select-user-badge-evidence {:id badge-id} (u/get-db ctx))
-        endorsments (->> (select-user-badge-endorsements {:id badge-id} (u/get-db ctx)) (endorsement->endorsement-class ctx))]
-    {"user" {user-id {"badge" {badge-id (assoc badge-updates :evidence evidence :endorsement endorsments)}}}}))
+        endorsements (->> (select-user-badge-endorsements {:id badge-id} (u/get-db ctx)) (endorsement->endorsement-class ctx))]
+    {"user" {user-id {"badge" {badge-id (assoc badge-updates :evidence evidence :endorsement endorsements)}}}}))

 (defn- issued-by-factory [ctx badge]


Make combat give more wtl. Make eating give less wtl

--- src/cljc/robinson/player.cljc
+++ src/cljc/robinson/player.cljc
@@ -533,9 +533,9 @@
   [state npc attack]
   (let [max-will-to-live (get-in state [:world :player :max-will-to-live])
         previous-kills   (get-in state [:world :player :stats :animals-killed (get npc :race)] 0)
-        dwill-to-live    (/ 10 (inc previous-kills))]
+        dwill-to-live    (/ 20 (inc previous-kills))]
     (-> state
-      (update-in [:world :player :will-to-live] (fn [will-to-live] (min max-will-to-live (+ will-to-live dwill-to-live))))
+      (player-update-wtl (fn [will-to-live] (min max-will-to-live (+ will-to-live dwill-to-live))))
       (update-in [:world :player :stats :animals-killed] (fn [animals-killed] (merge-with + animals-killed {(get npc :race) 1})))
       (update-in [:world :player :stats :kills-by-attack-type] (fn [kills-by-attack-type] (merge-with + kills-by-attack-type {attack 1})))
       (rc/conj-in   [:world :player :stats :timeline] {:time  (get-in state [:world :time])
@@ -571,7 +571,7 @@
   [state item]
   (let [max-will-to-live (get-in state [:world :player :max-will-to-live])
         previous-eaten (get-in state [:world :player :stats :num-items-eaten (get item :id)] 0)
-        dwill-to-live    (/ 10 (inc previous-eaten))]
+        dwill-to-live    (/ 3 (inc previous-eaten))]
     (-> state
       (update-in [:world :player :will-to-live] (fn [will-to-live] (min max-will-to-live (+ will-to-live dwill-to-live))))
       (update-in [:world :player :stats :num-items-eaten] (fn [num-items-eaten] (merge-with + num-items-eaten {(get item :id) 1})))


Make fruit more abundant

Make fruit more abundant

--- src/cljc/robinson/update.cljc
+++ src/cljc/robinson/update.cljc
@@ -2514,7 +2514,7 @@
                 ;; drop fruit
                 (contains? fruit-tree-types cell-type)
                 ;; chance of dropped a fruit
-                (if (= (rr/uniform-int 0 5000) 0)
+                (if (= (rr/uniform-int 0 2000) 0)
                   ;; make the fruit item and find an adjacent free cell to drop it into
                   (let [item    (assoc (ig/id->item (get cell :fruit-type)) :rot-time (+ (rw/get-time state) (rr/uniform-int 10 30)))
                         adj-xys (remove (fn [[x y]] (or (not (rv/xy-in-viewport? state x y))


Fix reveal when descending stairs

Fix reveal when descending stairs

--- src/cljc/robinson/update.cljc
+++ src/cljc/robinson/update.cljc
@@ -3220,7 +3220,7 @@
                            :up-right   [move-up-right          rw/current-state false]
                            :down-left  [move-down-left         rw/current-state false]
                            :down-right [move-down-right        rw/current-state false]
-                           \>          [use-stairs             :normal          false]
+                           \>          [use-stairs             :normal          true]
                            \<          [use-stairs             :normal          false]
                            :space      [action-select          rw/current-state false]
                            \q          [quaff-select           rw/current-state false]


mark active menu item

mark active menu item

--- src/cljs/clojexcms/frame.cljs
+++ src/cljs/clojexcms/frame.cljs
@@ -6,7 +6,8 @@

 (defcomponent menu-entry [ui owner {:keys [id icon title]}]
   (render [_]
-          (dom/li {:on-click (fn [e]
+          (dom/li {:class (if (= id (:page ui)) "selected")
+                   :on-click (fn [e]
                                (om/update! ui :page id)
                                (.preventDefault e))}
                   (dom/a {:href "#"}