CLJS-1254: Update REPL browser agent detection

CLJS-1253: Create/Use new Closure Library Release

Update closure library dependency.

Change js-deps/goog-dependencies* to account for additional
optional module argument to goog.addDependency.

Update clojure.browser.repl to use goog.userAgent.product
namespace instead of labs.

Author: swannodette

pom.template.xml

@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.clojure</groupId>
       <artifactId>google-closure-library</artifactId>
-      <version>0.0-20140718-946a7d39</version>
+      <version>0.0-20150505-021ed5b3</version>
     </dependency>
     <dependency>
       <groupId>org.clojure</groupId>

project.clj

@@ -11,7 +11,7 @@
   :dependencies [[org.clojure/clojure "1.7.0-beta2"]
                  [org.clojure/data.json "0.2.6"]
                  [org.clojure/tools.reader "0.9.2"]
-                 [org.clojure/google-closure-library "0.0-20140718-946a7d39"]
+                 [org.clojure/google-closure-library "0.0-20150505-021ed5b3"]
                  [com.google.javascript/closure-compiler "v20150505"]
                  [org.mozilla/rhino "1.7R5"]]
   :profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}

script/bootstrap

@@ -5,7 +5,7 @@ set -e
 CLOJURE_RELEASE="1.7.0-beta2"
 CLOSURE_RELEASE="20150505"
 DJSON_RELEASE="0.2.6"
-GCLOSURE_LIB_RELEASE="0.0-20140718-946a7d39"
+GCLOSURE_LIB_RELEASE="0.0-20150505-021ed5b3"
 RHINO_RELEASE="1_7R5"
 TREADER_RELEASE="0.9.2"
 

src/clj/cljs/js_deps.clj

@@ -263,13 +263,13 @@ JavaScript library containing provide/require 'declarations'."
                                 (string/split #"'\s*,\s*'"))))]
     (with-open [reader (io/reader (io/resource "goog/deps.js"))]
       (->> (line-seq reader)
-           (map #(re-matches #"^goog\.addDependency\(['\"](.*)['\"],\s*\[(.*)\],\s*\[(.*)\]\);.*" %))
+           (map #(re-matches #"^goog\.addDependency\(['\"](.*)['\"],\s*\[(.*)\],\s*\[(.*)\],.*\);.*" %))
            (remove nil?)
            (map #(drop 1 %))
            (remove #(.startsWith ^String (first %) "../../third_party"))
-           (map #(hash-map :file (str "goog/"(first %))
-                           :provides (parse-list (second %))
-                           :requires (parse-list (last %))
+           (map #(hash-map :file (str "goog/" (nth % 0))
+                           :provides (parse-list (nth % 1))
+                           :requires (parse-list (nth % 2))
                            :group :goog))
            (doall)))))
 

src/cljs/clojure/browser/repl.cljs

@@ -16,7 +16,7 @@
       :author "Bobby Calderwood and Alex Redington"}
   clojure.browser.repl
   (:require [goog.dom :as gdom]
-            [goog.labs.userAgent.browser :as gbrowser]
+            [goog.userAgent.product :as product]
             [clojure.browser.net   :as net]
             [clojure.browser.event :as event]
             ;; repl-connection callback will receive goog.require('cljs.repl')
@@ -35,10 +35,10 @@
 ;; see goog.userAgent.product
 (defn get-ua-product []
   (cond
-    (gbrowser/isSafari) :safari
-    (gbrowser/isChrome) :chrome
-    (gbrowser/isFirefox) :firefox
-    (gbrowser/isIE) :ie))
+    product/SAFARI :safari
+    product/CHROME :chrome
+    product/FIREFOX :firefox
+    product/IE :ie))
 
 (defn evaluate-javascript
   "Process a single block of JavaScript received from the server"