diff --git a/project.clj b/project.clj index 28d896359d..78850fddca 100644 --- a/project.clj +++ b/project.clj @@ -4,13 +4,14 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[org.clojure/clojure "1.9.0-alpha13"] - [org.clojure/clojurescript "1.9.456"] + [org.clojure/clojurescript "1.9.671"] [reagent "0.6.0" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server]] [re-frame "0.7.0"] [natal-shell "0.3.0"] [com.andrewmcveigh/cljs-time "0.4.0"] [tailrecursion/cljs-priority-map "1.2.0"] - [com.taoensso/timbre "4.7.4"]] + [com.taoensso/timbre "4.7.4"] + [com.google.guava/guava "21.0"]] :plugins [[lein-cljsbuild "1.1.4"] [lein-figwheel "0.5.8"] [lein-re-frisk "0.4.7"] @@ -35,14 +36,14 @@ :cljsbuild {:builds [{:id :ios :source-paths ["src" "env/dev"] :figwheel true - :compiler {:output-to "target/ios/not-used.js" + :compiler {:output-to "target/ios/app.js" :main "env.ios.main" :output-dir "target/ios" :optimizations :none}} {:id :android :source-paths ["src" "env/dev"] :figwheel true - :compiler {:output-to "target/android/not-used.js" + :compiler {:output-to "target/android/app.js" :main "env.android.main" :output-dir "target/android" :optimizations :none}} @@ -64,7 +65,8 @@ :optimize-constants true :optimizations :advanced :externs ["externs/externs.js"] - :closure-defines {"goog.DEBUG" false}}} + :closure-defines {"goog.DEBUG" false} + :parallel-build true}} {:id "android" :source-paths ["src" "env/prod"] :compiler {:output-to "index.android.js" @@ -74,4 +76,5 @@ :optimize-constants true :optimizations :advanced :externs ["externs/externs.js"] - :closure-defines {"goog.DEBUG" false}}}]}}}) + :closure-defines {"goog.DEBUG" false} + :parallel-build true}}]}}}) diff --git a/src/status_im/accounts/recover/screen.cljs b/src/status_im/accounts/recover/screen.cljs index 7638d78195..c23fb8eae0 100644 --- a/src/status_im/accounts/recover/screen.cljs +++ b/src/status_im/accounts/recover/screen.cljs @@ -14,7 +14,7 @@ [status-im.i18n :as i18n] [status-im.accounts.recover.styles :as st] [status-im.accounts.recover.validations :as v] - [cljs.spec :as spec] + [cljs.spec.alpha :as spec] [clojure.string :as str])) (defview passphrase-input [passphrase] @@ -53,4 +53,4 @@ [password-input (or password "")] [view {:flex 1}] (when valid-form? - [sticky-button (i18n/label :t/recover-access) #(dispatch [:recover-account passphrase password])])])) \ No newline at end of file + [sticky-button (i18n/label :t/recover-access) #(dispatch [:recover-account passphrase password])])])) diff --git a/src/status_im/accounts/recover/validations.cljs b/src/status_im/accounts/recover/validations.cljs index c2f8ee386f..90b3246ed5 100644 --- a/src/status_im/accounts/recover/validations.cljs +++ b/src/status_im/accounts/recover/validations.cljs @@ -1,5 +1,5 @@ (ns status-im.accounts.recover.validations - (:require [cljs.spec :as s])) + (:require [cljs.spec.alpha :as s])) (s/def ::not-empty-string (s/and string? not-empty)) (s/def ::passphrase ::not-empty-string) diff --git a/src/status_im/components/drawer/view.cljs b/src/status_im/components/drawer/view.cljs index e813eda819..65610d02ca 100644 --- a/src/status_im/components/drawer/view.cljs +++ b/src/status_im/components/drawer/view.cljs @@ -1,6 +1,6 @@ (ns status-im.components.drawer.view (:require-macros [status-im.utils.views :refer [defview]]) - (:require [cljs.spec :as s] + (:require [cljs.spec.alpha :as s] [clojure.string :as str] [reagent.core :as r] [re-frame.core :as rf] @@ -29,7 +29,7 @@ [status-im.utils.platform :as platform] [status-im.utils.utils :as utils])) -(defonce drawer-atom (atom)) +(defonce drawer-atom (atom nil)) (defn open-drawer [] (.openDrawer @drawer-atom)) (defn close-drawer [] (.closeDrawer @drawer-atom)) diff --git a/src/status_im/components/nfc.cljs b/src/status_im/components/nfc.cljs index ed17fefb3f..1aa6150ceb 100644 --- a/src/status_im/components/nfc.cljs +++ b/src/status_im/components/nfc.cljs @@ -1,5 +1,5 @@ (ns status-im.components.nfc - (:require [cljs.spec :as s] + (:require [cljs.spec.alpha :as s] [status-im.utils.platform :as platform])) (def class diff --git a/src/status_im/contacts/validations.cljs b/src/status_im/contacts/validations.cljs index 485d0bc418..0540aedeb8 100644 --- a/src/status_im/contacts/validations.cljs +++ b/src/status_im/contacts/validations.cljs @@ -1,5 +1,5 @@ (ns status-im.contacts.validations - (:require [cljs.spec :as s] + (:require [cljs.spec.alpha :as s] [clojure.string :as str] [status-im.data-store.contacts :as contacts])) diff --git a/src/status_im/contacts/views/new_contact.cljs b/src/status_im/contacts/views/new_contact.cljs index 9e1f8a6f05..395b557b7d 100644 --- a/src/status_im/contacts/views/new_contact.cljs +++ b/src/status_im/contacts/views/new_contact.cljs @@ -21,7 +21,7 @@ color-blue]] [status-im.components.image-button.view :refer [scan-button]] [status-im.i18n :refer [label]] - [cljs.spec :as s] + [cljs.spec.alpha :as s] [status-im.contacts.validations :as v] [status-im.contacts.styles :as st] [status-im.data-store.contacts :as contacts] diff --git a/src/status_im/new_group/screen_private.cljs b/src/status_im/new_group/screen_private.cljs index 904a19795e..ed99083ce3 100644 --- a/src/status_im/new_group/screen_private.cljs +++ b/src/status_im/new_group/screen_private.cljs @@ -22,7 +22,7 @@ [status-im.new-group.validations :as v] [status-im.i18n :refer [label]] [status-im.utils.platform :refer [ios?]] - [cljs.spec :as s])) + [cljs.spec.alpha :as s])) (def contacts-limit 3) diff --git a/src/status_im/new_group/screen_public.cljs b/src/status_im/new_group/screen_public.cljs index a5aad276f0..e0433635ff 100644 --- a/src/status_im/new_group/screen_public.cljs +++ b/src/status_im/new_group/screen_public.cljs @@ -18,7 +18,7 @@ [status-im.new-group.styles :as st] [status-im.new-group.validations :as v] [status-im.i18n :refer [label]] - [cljs.spec :as s])) + [cljs.spec.alpha :as s])) (defview new-group-toolbar [] [topic [:get :public-group/topic]] diff --git a/src/status_im/new_group/validations.cljs b/src/status_im/new_group/validations.cljs index 821f267fc0..3b82b1337c 100644 --- a/src/status_im/new_group/validations.cljs +++ b/src/status_im/new_group/validations.cljs @@ -1,5 +1,5 @@ (ns status-im.new-group.validations - (:require [cljs.spec :as s] + (:require [cljs.spec.alpha :as s] [status-im.utils.phone-number :refer [valid-mobile-number?]] [status-im.constants :refer [console-chat-id wallet-chat-id]] [clojure.string :as str] diff --git a/src/status_im/new_group/views/chat_group_settings.cljs b/src/status_im/new_group/views/chat_group_settings.cljs index 0687edecda..afa607d01f 100644 --- a/src/status_im/new_group/views/chat_group_settings.cljs +++ b/src/status_im/new_group/views/chat_group_settings.cljs @@ -19,7 +19,7 @@ [status-im.new-group.validations :as v] [status-im.i18n :refer [label]] [status-im.utils.platform :refer [ios?]] - [cljs.spec :as s])) + [cljs.spec.alpha :as s])) (def contacts-limit 3) diff --git a/src/status_im/profile/edit/screen.cljs b/src/status_im/profile/edit/screen.cljs index 5691188a73..d4d07a8c11 100644 --- a/src/status_im/profile/edit/screen.cljs +++ b/src/status_im/profile/edit/screen.cljs @@ -1,6 +1,6 @@ (ns status-im.profile.edit.screen (:require-macros [status-im.utils.views :refer [defview]]) - (:require [cljs.spec :as s] + (:require [cljs.spec.alpha :as s] [clojure.string :as str] [reagent.core :as r] [re-frame.core :refer [dispatch]] diff --git a/src/status_im/profile/validations.cljs b/src/status_im/profile/validations.cljs index d3aea1b3fc..73a2057fb1 100644 --- a/src/status_im/profile/validations.cljs +++ b/src/status_im/profile/validations.cljs @@ -1,5 +1,5 @@ (ns status-im.profile.validations - (:require [cljs.spec :as s] + (:require [cljs.spec.alpha :as s] [status-im.constants :refer [console-chat-id wallet-chat-id]] [status-im.chat.constants :as chat-consts] [clojure.string :as str] diff --git a/src/status_im/protocol/chat.cljs b/src/status_im/protocol/chat.cljs index 427adacd19..dc9c3208dc 100644 --- a/src/status_im/protocol/chat.cljs +++ b/src/status_im/protocol/chat.cljs @@ -1,5 +1,5 @@ (ns status-im.protocol.chat - (:require [cljs.spec :as s] + (:require [cljs.spec.alpha :as s] [status-im.protocol.web3.filtering :as f] [status-im.protocol.web3.delivery :as d] [taoensso.timbre :refer-macros [debug]] diff --git a/src/status_im/protocol/core.cljs b/src/status_im/protocol/core.cljs index f0d06d0f83..96d64d3679 100644 --- a/src/status_im/protocol/core.cljs +++ b/src/status_im/protocol/core.cljs @@ -12,7 +12,7 @@ [status-im.protocol.listeners :as l] [status-im.protocol.encryption :as e] [status-im.protocol.discoveries :as discoveries] - [cljs.spec :as s] + [cljs.spec.alpha :as s] [status-im.utils.random :as random])) ;; user diff --git a/src/status_im/protocol/discoveries.cljs b/src/status_im/protocol/discoveries.cljs index a6e5c4b8ff..1f4e458cec 100644 --- a/src/status_im/protocol/discoveries.cljs +++ b/src/status_im/protocol/discoveries.cljs @@ -5,7 +5,7 @@ [status-im.protocol.web3.delivery :as d] [status-im.protocol.web3.filtering :as f] [status-im.protocol.listeners :as l] - [cljs.spec :as s] + [cljs.spec.alpha :as s] [status-im.protocol.validation :refer-macros [valid?]] [status-im.utils.random :as random] [status-im.protocol.web3.keys :as shh-keys])) diff --git a/src/status_im/protocol/group.cljs b/src/status_im/protocol/group.cljs index d84174270b..9230efdb55 100644 --- a/src/status_im/protocol/group.cljs +++ b/src/status_im/protocol/group.cljs @@ -2,7 +2,7 @@ (:require [status-im.protocol.web3.delivery :as d] [status-im.protocol.web3.utils :as u] - [cljs.spec :as s] + [cljs.spec.alpha :as s] [taoensso.timbre :refer-macros [debug]] [status-im.protocol.validation :refer-macros [valid?]] [status-im.protocol.web3.filtering :as f] diff --git a/src/status_im/protocol/message.cljs b/src/status_im/protocol/message.cljs index 7ed4b46683..d57dbe1963 100644 --- a/src/status_im/protocol/message.cljs +++ b/src/status_im/protocol/message.cljs @@ -1,5 +1,5 @@ (ns status-im.protocol.message - (:require [cljs.spec :as s])) + (:require [cljs.spec.alpha :as s])) (s/def :message/ttl (s/and int? pos?)) (s/def :message/from string?) diff --git a/src/status_im/protocol/validation.clj b/src/status_im/protocol/validation.clj index c9d472fd10..1e6361b53e 100644 --- a/src/status_im/protocol/validation.clj +++ b/src/status_im/protocol/validation.clj @@ -3,9 +3,9 @@ (defn- fline [and-form] (:line (meta and-form))) (defmacro valid? [spec x] - `(let [v?# (cljs.spec/valid? ~spec ~x)] + `(let [v?# (cljs.spec.alpha/valid? ~spec ~x)] (when-not v?# - (let [explanation# (cljs.spec/explain-str ~spec ~x)] + (let [explanation# (cljs.spec.alpha/explain-str ~spec ~x)] (taoensso.timbre/log! :error :p [explanation#] ~{:?line (fline &form)}))) diff --git a/src/status_im/protocol/web3/delivery.cljs b/src/status_im/protocol/web3/delivery.cljs index 804b7bb9a3..11157a57cd 100644 --- a/src/status_im/protocol/web3/delivery.cljs +++ b/src/status_im/protocol/web3/delivery.cljs @@ -4,7 +4,7 @@ [status-im.protocol.web3.transport :as t] [status-im.protocol.web3.utils :as u] [status-im.protocol.encryption :as e] - [cljs.spec :as s] + [cljs.spec.alpha :as s] [taoensso.timbre :refer-macros [debug] :as log] [status-im.protocol.validation :refer-macros [valid?]] [clojure.set :as set] diff --git a/src/status_im/protocol/web3/filtering.cljs b/src/status_im/protocol/web3/filtering.cljs index 22c9c7633c..c36ae23907 100644 --- a/src/status_im/protocol/web3/filtering.cljs +++ b/src/status_im/protocol/web3/filtering.cljs @@ -1,6 +1,6 @@ (ns status-im.protocol.web3.filtering (:require [status-im.protocol.web3.utils :as u] - [cljs.spec :as s] + [cljs.spec.alpha :as s] [taoensso.timbre :as log])) (def status-topic "0xaabb11ee") diff --git a/src/status_im/protocol/web3/transport.cljs b/src/status_im/protocol/web3/transport.cljs index 02bd9a0a49..ecc6ae47d3 100644 --- a/src/status_im/protocol/web3/transport.cljs +++ b/src/status_im/protocol/web3/transport.cljs @@ -1,6 +1,6 @@ (ns status-im.protocol.web3.transport (:require [status-im.protocol.web3.utils :as u] - [cljs.spec :as s] + [cljs.spec.alpha :as s] [status-im.protocol.validation :refer-macros [valid?]] [taoensso.timbre :refer-macros [debug]]))