From da038aaa67d5fabf764b7d62a04222fc902f2f88 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Wed, 22 Apr 2020 13:30:44 +0200 Subject: [PATCH] bump re-frame and remove 16ms delay for reagent tick Signed-off-by: Andrey Shovkoplyas --- deps.edn | 4 +- env/dev/env/android/main.cljs | 7 +- env/dev/env/ios/main.cljs | 7 +- env/prod/env/android/main.cljs | 11 +- env/prod/env/ios/main.cljs | 11 +- nix/lein/lein-project-deps-maven-inputs.txt | 14 +- nix/lein/lein-project-deps.nix | 202 ++++++++++++-------- project.clj | 2 +- 8 files changed, 157 insertions(+), 101 deletions(-) diff --git a/deps.edn b/deps.edn index 248d87766b..713a274e82 100644 --- a/deps.edn +++ b/deps.edn @@ -4,9 +4,7 @@ org.clojure/core.async {:mvn/version "0.4.474"} reagent {:mvn/version "0.7.0" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]} - re-frame {:git/url "https://github.com/status-im/re-frame" - :sha "b0d3b0f016f217c6a397a54e5eba9486471fb172" - :deps/manifest :deps} + re-frame {:mvn/version "0.12.0"} com.andrewmcveigh/cljs-time {:mvn/version "0.5.2"} binaryage/oops {:mvn/version "0.7.0"} status-im/timbre {:mvn/version "4.10.0-2-status"} diff --git a/env/dev/env/android/main.cljs b/env/dev/env/android/main.cljs index db9bab1360..e1b17fe7d0 100644 --- a/env/dev/env/android/main.cljs +++ b/env/dev/env/android/main.cljs @@ -5,7 +5,12 @@ [re-frisk-remote.core :as rr] [env.config :as conf] [env.utils] - [status-im.utils.handlers :as utils.handlers])) + [status-im.utils.handlers :as utils.handlers] + [re-frame.interop :as interop] + [reagent.impl.batching :as batching])) + +(set! interop/next-tick js/setTimeout) +(set! batching/fake-raf #(js/setTimeout % 0)) (enable-console-print!) diff --git a/env/dev/env/ios/main.cljs b/env/dev/env/ios/main.cljs index fb4a045ccf..2710c38a8e 100644 --- a/env/dev/env/ios/main.cljs +++ b/env/dev/env/ios/main.cljs @@ -5,7 +5,12 @@ [status-im.utils.handlers :as utils.handlers] [figwheel.client :as figwheel] [env.config :as conf] - [env.utils])) + [env.utils] + [re-frame.interop :as interop] + [reagent.impl.batching :as batching])) + +(set! interop/next-tick js/setTimeout) +(set! batching/fake-raf #(js/setTimeout % 0)) (enable-console-print!) diff --git a/env/prod/env/android/main.cljs b/env/prod/env/android/main.cljs index b1e717e078..ce3cf08157 100644 --- a/env/prod/env/android/main.cljs +++ b/env/prod/env/android/main.cljs @@ -1,6 +1,11 @@ - (ns env.android.main - (:require [status-im.android.core :as core])) +(ns env.android.main + (:require [status-im.android.core :as core] + [re-frame.interop :as interop] + [reagent.impl.batching :as batching])) - (core/init) +(set! interop/next-tick js/setTimeout) +(set! batching/fake-raf #(js/setTimeout % 0)) + +(core/init) diff --git a/env/prod/env/ios/main.cljs b/env/prod/env/ios/main.cljs index 67664f36de..99bdabd446 100644 --- a/env/prod/env/ios/main.cljs +++ b/env/prod/env/ios/main.cljs @@ -1,6 +1,9 @@ - (ns env.ios.main - (:require [status-im.ios.core :as core])) - - (core/init) +(ns env.ios.main + (:require [status-im.ios.core :as core] + [re-frame.interop :as interop] + [reagent.impl.batching :as batching])) +(set! interop/next-tick js/setTimeout) +(set! batching/fake-raf #(js/setTimeout % 0)) +(core/init) \ No newline at end of file diff --git a/nix/lein/lein-project-deps-maven-inputs.txt b/nix/lein/lein-project-deps-maven-inputs.txt index ab10c76386..e106159ccd 100644 --- a/nix/lein/lein-project-deps-maven-inputs.txt +++ b/nix/lein/lein-project-deps-maven-inputs.txt @@ -13,12 +13,15 @@ https://repo.clojars.org/cljsjs/highlight/9.6.0-0/highlight-9.6.0-0 https://repo.clojars.org/cljsjs/prop-types/15.6.0-0/prop-types-15.6.0-0 https://repo.clojars.org/cljsjs/react-dom-server/15.2.1-0/react-dom-server-15.2.1-0 https://repo.clojars.org/cljsjs/react-dom-server/15.5.4-0/react-dom-server-15.5.4-0 +https://repo.clojars.org/cljsjs/react-dom-server/16.13.0-0/react-dom-server-16.13.0-0 https://repo.clojars.org/cljsjs/react-dom/15.2.1-0/react-dom-15.2.1-0 https://repo.clojars.org/cljsjs/react-dom/15.5.4-0/react-dom-15.5.4-0 +https://repo.clojars.org/cljsjs/react-dom/16.13.0-0/react-dom-16.13.0-0 https://repo.clojars.org/cljsjs/react-flip-move/2.9.17-0/react-flip-move-2.9.17-0 https://repo.clojars.org/cljsjs/react-highlight/1.0.7-1/react-highlight-1.0.7-1 https://repo.clojars.org/cljsjs/react/15.2.1-0/react-15.2.1-0 https://repo.clojars.org/cljsjs/react/15.5.4-0/react-15.5.4-0 +https://repo.clojars.org/cljsjs/react/16.13.0-0/react-16.13.0-0 https://repo.clojars.org/clout/clout/2.1.2/clout-2.1.2 https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.4.0/cljs-time-0.4.0 https://repo.clojars.org/com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2 @@ -49,13 +52,16 @@ https://repo.clojars.org/medley/medley/0.8.2/medley-0.8.2 https://repo.clojars.org/meta-merge/meta-merge/1.0.0/meta-merge-1.0.0 https://repo.clojars.org/mvxcvi/alphabase/1.0.0/alphabase-1.0.0 https://repo.clojars.org/net/cgrand/macrovich/0.2.0/macrovich-0.2.0 +https://repo.clojars.org/net/cgrand/macrovich/0.2.1/macrovich-0.2.1 https://repo.clojars.org/quoin/quoin/0.1.2/quoin-0.1.2 https://repo.clojars.org/rasom/lein-githooks/0.1.5/lein-githooks-0.1.5 https://repo.clojars.org/re-com/re-com/2.1.0/re-com-2.1.0 https://repo.clojars.org/re-frame/re-frame/0.10.1/re-frame-0.10.1 +https://repo.clojars.org/re-frame/re-frame/0.12.0/re-frame-0.12.0 https://repo.clojars.org/re-frisk-shell/re-frisk-shell/0.5.2/re-frisk-shell-0.5.2 https://repo.clojars.org/re-frisk-sidecar/re-frisk-sidecar/0.5.7/re-frisk-sidecar-0.5.7 https://repo.clojars.org/re-frisk/re-frisk/0.5.4/re-frisk-0.5.4 +https://repo.clojars.org/reagent/reagent/0.10.0/reagent-0.10.0 https://repo.clojars.org/reagent/reagent/0.6.0/reagent-0.6.0 https://repo.clojars.org/reagent/reagent/0.7.0/reagent-0.7.0 https://repo.clojars.org/rewrite-clj/rewrite-clj/0.5.2/rewrite-clj-0.5.2 @@ -73,7 +79,6 @@ https://repo.clojars.org/ring/ring-core/1.5.1/ring-core-1.5.1 https://repo.clojars.org/ring/ring-defaults/0.1.5/ring-defaults-0.1.5 https://repo.clojars.org/ring/ring-headers/0.1.3/ring-headers-0.1.3 https://repo.clojars.org/ring/ring-ssl/0.2.1/ring-ssl-0.2.1 -https://repo.clojars.org/status-im/re-frame/0.10.5/re-frame-0.10.5 https://repo.clojars.org/status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status https://repo.clojars.org/viebel/codox-klipse-theme/0.0.1/codox-klipse-theme-0.0.1 https://repo.clojars.org/zprint/zprint/0.4.7/zprint-0.4.7 @@ -122,14 +127,12 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v2 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20160911/closure-compiler-externs-v20160911 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20161201/closure-compiler-externs-v20161201 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170521/closure-compiler-externs-v20170521 -https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170806/closure-compiler-externs-v20170806 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170910/closure-compiler-externs-v20170910 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20190325/closure-compiler-externs-v20190325 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20160315/closure-compiler-main-v20160315 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20160911/closure-compiler-main-v20160911 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20161201/closure-compiler-main-v20161201 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170521/closure-compiler-main-v20170521 -https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170806/closure-compiler-main-v20170806 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170910/closure-compiler-main-v20170910 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20190325/closure-compiler-main-v20190325 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20150126/closure-compiler-parent-v20150126 @@ -138,14 +141,12 @@ https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20160911/closure-compiler-parent-v20160911 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20161201/closure-compiler-parent-v20161201 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170521/closure-compiler-parent-v20170521 -https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170806/closure-compiler-parent-v20170806 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170910/closure-compiler-parent-v20170910 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20190325/closure-compiler-parent-v20190325 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20160315/closure-compiler-unshaded-v20160315 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20160911/closure-compiler-unshaded-v20160911 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20161201/closure-compiler-unshaded-v20161201 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170521/closure-compiler-unshaded-v20170521 -https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170806/closure-compiler-unshaded-v20170806 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170910/closure-compiler-unshaded-v20170910 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20190325/closure-compiler-unshaded-v20190325 https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20150126/closure-compiler-v20150126 @@ -187,6 +188,7 @@ https://repo1.maven.org/maven2/org/apache/commons/commons-parent/35/commons-pare https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39 https://repo1.maven.org/maven2/org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0 https://repo1.maven.org/maven2/org/clojure/clojure/1.10.0/clojure-1.10.0 +https://repo1.maven.org/maven2/org/clojure/clojure/1.10.1/clojure-1.10.1 https://repo1.maven.org/maven2/org/clojure/clojure/1.2.1/clojure-1.2.1 https://repo1.maven.org/maven2/org/clojure/clojure/1.3.0/clojure-1.3.0 https://repo1.maven.org/maven2/org/clojure/clojure/1.4.0/clojure-1.4.0 @@ -207,7 +209,6 @@ https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.293/clojurescript-1 https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.456/clojurescript-1.9.456 https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.655/clojurescript-1.9.655 https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.671/clojurescript-1.9.671 -https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.908/clojurescript-1.9.908 https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.946/clojurescript-1.9.946 https://repo1.maven.org/maven2/org/clojure/core.async/0.2.395/core.async-0.2.395 https://repo1.maven.org/maven2/org/clojure/core.async/0.4.474/core.async-0.4.474 @@ -238,6 +239,7 @@ https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.6.10/tools.analy https://repo1.maven.org/maven2/org/clojure/tools.analyzer.jvm/0.7.0/tools.analyzer.jvm-0.7.0 https://repo1.maven.org/maven2/org/clojure/tools.analyzer/0.6.9/tools.analyzer-0.6.9 https://repo1.maven.org/maven2/org/clojure/tools.logging/0.3.1/tools.logging-0.3.1 +https://repo1.maven.org/maven2/org/clojure/tools.logging/0.4.1/tools.logging-0.4.1 https://repo1.maven.org/maven2/org/clojure/tools.macro/0.1.5/tools.macro-0.1.5 https://repo1.maven.org/maven2/org/clojure/tools.namespace/0.2.11/tools.namespace-0.2.11 https://repo1.maven.org/maven2/org/clojure/tools.reader/0.10.0/tools.reader-0.10.0 diff --git a/nix/lein/lein-project-deps.nix b/nix/lein/lein-project-deps.nix index 171c701079..698bbe31bd 100644 --- a/nix/lein/lein-project-deps.nix +++ b/nix/lein/lein-project-deps.nix @@ -245,6 +245,21 @@ in { sha256 = "0av92sbdwadig50b1ljxy7n3rvpk2hy3c67rh57vqfc4jids6ank"; }; }; + "https://repo.clojars.org/cljsjs/react-dom-server/16.13.0-0/react-dom-server-16.13.0-0" = + { + host = repositories.clojars; + path = + "cljsjs/react-dom-server/16.13.0-0/react-dom-server-16.13.0-0"; + type = "jar"; + pom = { + sha1 = "320f6487531caf52b15ef10d43129b80c40f7c35"; + sha256 = "1l9s4akd1s06xcx0r38h6xf82bcr0ypmaw6xnvdrmll19a3g9ilc"; + }; + jar = { + sha1 = "4d400ae4f66687286170eb691aa8e642fe87aa47"; + sha256 = "0fzwd6hfb2rx85pr6fsr2r4x76a90wgnjgnv23jzfn1vw6znch07"; + }; + }; "https://repo.clojars.org/cljsjs/react-dom/15.2.1-0/react-dom-15.2.1-0" = { host = repositories.clojars; @@ -275,6 +290,21 @@ in { sha256 = "1qn5ycr9vsbbvq06clliwf89sk2838q6i86k35k2ghvvjwiwaxwl"; }; }; + "https://repo.clojars.org/cljsjs/react-dom/16.13.0-0/react-dom-16.13.0-0" = + { + host = repositories.clojars; + path = + "cljsjs/react-dom/16.13.0-0/react-dom-16.13.0-0"; + type = "jar"; + pom = { + sha1 = "367f3754430e092e8c9a5a9f58955fa68389401b"; + sha256 = "0x5klcq3bdbckfi6dqy160rd2r9g3593gp86ha7a6b7p2sfrvmal"; + }; + jar = { + sha1 = "b87b10a7d48e1c773eedfeb737f680a5566b7321"; + sha256 = "10d9l42v7g78gpv6xklydywlpbvpxiky6gw1w3hnzrlqgbd40ip1"; + }; + }; "https://repo.clojars.org/cljsjs/react-flip-move/2.9.17-0/react-flip-move-2.9.17-0" = { host = repositories.clojars; @@ -335,6 +365,21 @@ in { sha256 = "18p6bdmv09rkf9dg396770fb8h889132963233bd8bc2fs3knv6c"; }; }; + "https://repo.clojars.org/cljsjs/react/16.13.0-0/react-16.13.0-0" = + { + host = repositories.clojars; + path = + "cljsjs/react/16.13.0-0/react-16.13.0-0"; + type = "jar"; + pom = { + sha1 = "66011033045a6aaa778c01ed308675fa008817f0"; + sha256 = "1j17bw4vmi26782v84znxnrx1qpi0wm6agbpczds0gb5f9nr2myv"; + }; + jar = { + sha1 = "b72f3f9a69ec4039ac57597859ea4b5d1cfcd113"; + sha256 = "1dp4pi9jphncifa56kqj6sri8vwl62ia1xy3ii70fba1mdjij63s"; + }; + }; "https://repo.clojars.org/clout/clout/2.1.2/clout-2.1.2" = { host = repositories.clojars; @@ -785,6 +830,21 @@ in { sha256 = "0xffg2cydhr9k548w9w6ii6hkw7adicxr6i5s3wa77iz6c95j1za"; }; }; + "https://repo.clojars.org/net/cgrand/macrovich/0.2.1/macrovich-0.2.1" = + { + host = repositories.clojars; + path = + "net/cgrand/macrovich/0.2.1/macrovich-0.2.1"; + type = "jar"; + pom = { + sha1 = "8b596c51c4d541ce1cc936bba18ef4d0b8d4aac1"; + sha256 = "1ajpbx1bk2bp5f6zvs0yc6ikzx816l9jm2fchbn0mmlb4x4nmdxp"; + }; + jar = { + sha1 = "abcb26cbfe0f8eef363b25525210c0fe1eb1f693"; + sha256 = "119rmznkfsk1df3q9408dkd9kcqsbpffni19dzrjr7k05ijcl487"; + }; + }; "https://repo.clojars.org/quoin/quoin/0.1.2/quoin-0.1.2" = { host = repositories.clojars; @@ -845,6 +905,21 @@ in { sha256 = "0qb4dmyk10hcc88sl14jxq2s0yifrc0x71fxy76w2iqlql03ri6w"; }; }; + "https://repo.clojars.org/re-frame/re-frame/0.12.0/re-frame-0.12.0" = + { + host = repositories.clojars; + path = + "re-frame/re-frame/0.12.0/re-frame-0.12.0"; + type = "jar"; + pom = { + sha1 = "41fd34c15c1cf68eec81435e09d0a79fd8a88276"; + sha256 = "08c3sxi3sdkay3550vb3gbv5czzdh2kyin4mb8cpd2wd5g2c88sq"; + }; + jar = { + sha1 = "3ff92169fe7588ad62dad2d6ea3bf0e5d3e2d224"; + sha256 = "1m5sjskgjx028s1zpa631bp52y9hjn8l1nr8hrwiwdh09i2kpnk2"; + }; + }; "https://repo.clojars.org/re-frisk-shell/re-frisk-shell/0.5.2/re-frisk-shell-0.5.2" = { host = repositories.clojars; @@ -890,6 +965,21 @@ in { sha256 = "1bxrvx0v5fhn7m1qhd3b5s2rq5v34sgwpp0ad7c7ijmfdjsrrafr"; }; }; + "https://repo.clojars.org/reagent/reagent/0.10.0/reagent-0.10.0" = + { + host = repositories.clojars; + path = + "reagent/reagent/0.10.0/reagent-0.10.0"; + type = "jar"; + pom = { + sha1 = "0ced0db04eaf77ec3dfa7a3f56cc022fe2814d8b"; + sha256 = "15cqnfwkzxia6bdjq1kism72jf66zdpldk0925313z41ynkqfr8r"; + }; + jar = { + sha1 = "1a88fae22cd0f7f66bb181aa520da264a82f6942"; + sha256 = "0vdvm75rpcq9kx2sp0jd2lsa70fv2xymy1g55ss972s85p5j50bm"; + }; + }; "https://repo.clojars.org/reagent/reagent/0.6.0/reagent-0.6.0" = { host = repositories.clojars; @@ -1145,21 +1235,6 @@ in { sha256 = "0aiid67a7zl75xspx9naincb1ig8822ypdza2vpx18dmvc2pmfi3"; }; }; - "https://repo.clojars.org/status-im/re-frame/0.10.5/re-frame-0.10.5" = - { - host = repositories.clojars; - path = - "status-im/re-frame/0.10.5/re-frame-0.10.5"; - type = "jar"; - pom = { - sha1 = "3c18c5995d4facc049755e42ee371bbd25d544ac"; - sha256 = "12iqa4a4lbni8ynlzshwknc1zwh0vx9kkx7c8p63bd3zb2gkc2xp"; - }; - jar = { - sha1 = "26ff2f15eaf4ea6518adb1024bdb3f8ebd1945a9"; - sha256 = "1waddf88j3mc1pjipgmdkbs7943f7a2xy3n6b6hznp0fivyyhn38"; - }; - }; "https://repo.clojars.org/status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status" = { host = repositories.clojars; @@ -1820,21 +1895,6 @@ in { sha256 = "13yy2h4f9wbhilqw2sd7q3mgqmrpnlmwwhfg9nchkkz72rp5va97"; }; }; - "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170806/closure-compiler-externs-v20170806" = - { - host = repositories.maven; - path = - "com/google/javascript/closure-compiler-externs/v20170806/closure-compiler-externs-v20170806"; - type = "jar"; - pom = { - sha1 = "47dc661b62c270a42e001f54a7389f9c595b2012"; - sha256 = "1kn2gq9ac4s351l2s1sqrsi7y7l395d5akcrlm2zrrk0x6ixz07i"; - }; - jar = { - sha1 = "167b06d1a35eafeaec667ec40a3f59761d0b0ea2"; - sha256 = "13v9hvv7q3h54sni4s10yh9rnidbw36mcr3n8axylprpzijq6mwc"; - }; - }; "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-externs/v20170910/closure-compiler-externs-v20170910" = { host = repositories.maven; @@ -1909,17 +1969,6 @@ in { sha256 = "0c9daw25c559h68vhfxjnk5gbv1z8yqx230r6q3ziff0fcpsc85q"; }; }; - "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170806/closure-compiler-main-v20170806" = - { - host = repositories.maven; - path = - "com/google/javascript/closure-compiler-main/v20170806/closure-compiler-main-v20170806"; - type = "jar"; - pom = { - sha1 = "e1e930137926387eb85b55ef8f8beb49f5e2cb94"; - sha256 = "18jyzfk3fmv3041hmhlxz8zs67hzjggvi6yp5slgpn8qds7g7zkv"; - }; - }; "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-main/v20170910/closure-compiler-main-v20170910" = { host = repositories.maven; @@ -2008,17 +2057,6 @@ in { sha256 = "0s6860ypm0m34qg0fbs5b2mg6zj5ff3sfs900l7n4n06dk1854qy"; }; }; - "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170806/closure-compiler-parent-v20170806" = - { - host = repositories.maven; - path = - "com/google/javascript/closure-compiler-parent/v20170806/closure-compiler-parent-v20170806"; - type = "jar"; - pom = { - sha1 = "03c50880afb2a2dc970c4e6d45cadfc42b1fde7b"; - sha256 = "1lzszsynhy878r9b3fswdyig30zfz8z9syr7ix6kn6xwhzsdhy7i"; - }; - }; "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-parent/v20170910/closure-compiler-parent-v20170910" = { host = repositories.maven; @@ -2101,21 +2139,6 @@ in { sha256 = "1186iddh57ayy6x0r4zxjzj3w8f7vn2m132kc7bj1z8mf93337i6"; }; }; - "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170806/closure-compiler-unshaded-v20170806" = - { - host = repositories.maven; - path = - "com/google/javascript/closure-compiler-unshaded/v20170806/closure-compiler-unshaded-v20170806"; - type = "jar"; - pom = { - sha1 = "495bfb2243304025edc2f1f1d3033f1916d4d950"; - sha256 = "1ac5yc9fkv4sn7kcgsqqyjq4gx0ac9r8jkja710vzp24wi95dh24"; - }; - jar = { - sha1 = "1502e3813149a51d470e48e4c1a5c177968e08d0"; - sha256 = "0vrijahmmcswyzwbllqmzgclr3xzarlkrgjpx09cwzz5r3fl0q3c"; - }; - }; "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler-unshaded/v20170910/closure-compiler-unshaded-v20170910" = { host = repositories.maven; @@ -2675,6 +2698,21 @@ in { sha256 = "0f5fpgm2858jq5waq5ww1vvv44b5agi4vmnbhbgnwmy0b150j52h"; }; }; + "https://repo1.maven.org/maven2/org/clojure/clojure/1.10.1/clojure-1.10.1" = + { + host = repositories.maven; + path = + "org/clojure/clojure/1.10.1/clojure-1.10.1"; + type = "jar"; + pom = { + sha1 = "3fc51cbb6dc8bb6fefc2bae63da919ae7e3d538e"; + sha256 = "131sv1nv3s0mpfv3bplh1z0b6hh7m403x00sxn236iqfz8jazxqh"; + }; + jar = { + sha1 = "a1e6b92ce9b1bfc5d181867a45da8a38a6077662"; + sha256 = "06nj99mi0092qhv32ipk0nws4sdhnc890xx4gsgabllyzn8zkxnl"; + }; + }; "https://repo1.maven.org/maven2/org/clojure/clojure/1.2.1/clojure-1.2.1" = { host = repositories.maven; @@ -2975,21 +3013,6 @@ in { sha256 = "03sai76bg4k7djb2sz4vrac4gxzparl5awvsrrpzqh8sbjdm094a"; }; }; - "https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.908/clojurescript-1.9.908" = - { - host = repositories.maven; - path = - "org/clojure/clojurescript/1.9.908/clojurescript-1.9.908"; - type = "jar"; - pom = { - sha1 = "e2d7c02769bbf17bd56e33e80acb742b43f3a384"; - sha256 = "1b3hvkgfl2mqymz62r63912zkx9qmk4jw8qd7nfhznr3cbq9zzid"; - }; - jar = { - sha1 = "7aafdceb07450798660684b114537e12809d8678"; - sha256 = "0h1xi8wm3mdc3la9adrvh66rmblspfg4pnwdawmfvmj5znlna5jy"; - }; - }; "https://repo1.maven.org/maven2/org/clojure/clojurescript/1.9.946/clojurescript-1.9.946" = { host = repositories.maven; @@ -3428,6 +3451,21 @@ in { sha256 = "0727j7861m2b8z7d55a863d8mnlb28cz6850rv2s2cvs95fv4mzx"; }; }; + "https://repo1.maven.org/maven2/org/clojure/tools.logging/0.4.1/tools.logging-0.4.1" = + { + host = repositories.maven; + path = + "org/clojure/tools.logging/0.4.1/tools.logging-0.4.1"; + type = "jar"; + pom = { + sha1 = "483bbfc82aee3c005bb1ad36dec77ba5d6c5f95c"; + sha256 = "1qhfigr9am90fx527ax6f7z7xahgsd5hzb4pmi40n79nx3jsc9hf"; + }; + jar = { + sha1 = "991bebc6e3633b85091ae929d62c116a2584aee7"; + sha256 = "001sx1ddgx0ys0z1qphzpxjf2w35rikrfjc0h5bvvqbw8ra0vvja"; + }; + }; "https://repo1.maven.org/maven2/org/clojure/tools.macro/0.1.5/tools.macro-0.1.5" = { host = repositories.maven; diff --git a/project.clj b/project.clj index c2e6352a6d..3a03d282f9 100644 --- a/project.clj +++ b/project.clj @@ -15,7 +15,7 @@ [org.clojure/google-closure-library "0.0-20190213-2033d5d9"] [org.clojure/core.async "0.4.474"] [reagent "0.7.0" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]] - [status-im/re-frame "0.10.5"] + [re-frame "0.12.0"] [com.andrewmcveigh/cljs-time "0.5.2"] [status-im/timbre "4.10.0-2-status"] [com.taoensso/encore "2.94.0"]