status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

upgrade clojurescript to 1.9.671

This commit is contained in:
Roman Volosovskyi 2017-07-04 20:53:49 +03:00
parent 4d73c47e62
commit a2b2851061
22 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
project.clj
View File

@ -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}}]}}})

4
src/status_im/accounts/recover/screen.cljs
View File

@ -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])])]))
[sticky-button (i18n/label :t/recover-access) #(dispatch [:recover-account passphrase password])])]))

2
src/status_im/accounts/recover/validations.cljs
View File

@ -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)

4
src/status_im/components/drawer/view.cljs
View File

@ -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))

2
src/status_im/components/nfc.cljs
View File

@ -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

2
src/status_im/contacts/validations.cljs
View File

@ -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]))

2
src/status_im/contacts/views/new_contact.cljs
View File

@ -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]

2
src/status_im/new_group/screen_private.cljs
View File

@ -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)

2
src/status_im/new_group/screen_public.cljs
View File

@ -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]]

2
src/status_im/new_group/validations.cljs
View File

@ -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]

2
src/status_im/new_group/views/chat_group_settings.cljs
View File

@ -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)

2
src/status_im/profile/edit/screen.cljs
View File

@ -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]]

2
src/status_im/profile/validations.cljs
View File

@ -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]

2
src/status_im/protocol/chat.cljs
View File

@ -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]]

2
src/status_im/protocol/core.cljs
View File

@ -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

2
src/status_im/protocol/discoveries.cljs
View File

@ -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]))

2
src/status_im/protocol/group.cljs
View File

@ -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]

2
src/status_im/protocol/message.cljs
View File

@ -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?)

4
src/status_im/protocol/validation.clj
View File

@ -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)})))

2
src/status_im/protocol/web3/delivery.cljs
View File

@ -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]

2
src/status_im/protocol/web3/filtering.cljs
View File

@ -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")

2
src/status_im/protocol/web3/transport.cljs
View File

@ -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]]))