From 93f5b2e32c4287ce6ecad566168f3238944a9c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 20 Oct 2022 17:12:34 +0200 Subject: [PATCH] nix: fix shadow-cljs on M1 by upgrading to 2.11.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On M1 calling `shadow-cljs` fails with: ``` Execution error (UnsatisfiedLinkError) at java.lang.ClassLoader$NativeLibrary/load (ClassLoader.java:-2). /private/var/folders/__/x311ykg17rqgq2wyl4kn1pdr0001yh/T/jna8753030888504535661.tmp: dlopen(/private/var/folders/__/x311ykg17rqgq2wyl4kn1pdr0001yh/T/jna8753030888504535661.tmp, 0x0001): tried: '/private/var/folders/__/x311ykg17rqgq2wyl4kn1pdr0001yh/T/jna8753030888504535661.tmp' (fat file, but missing compatible architecture (have (unknown,i386,x86_64), need (arm64e))) ``` This is due to an outdeted dependency on JNA 3.2.2, which is pulled in by `hawk` package which up until release `2.11.16` was a `shadow-clj` dependency which was removed because it was: >Only used to be used on macOS since it was slightly faster than the default >JVM implementation. However in Big Sur it seems to cause issues and break >completely or just be a lot slower. https://github.com/thheller/shadow-cljs/commit/f3b89b5a Dropped the explicit dependency on `org.clojure/core.async` to avoid: ``` WARNING: The org.clojure/core.async dependency in shadow-cljs.edn was ignored. Default version is used and override is not allowed to ensure compatibility. ``` Resolves: https://github.com/status-im/status-mobile/issues/14196 Signed-off-by: Jakub SokoĊ‚owski --- nix/deps/clojure/deps.json | 381 +++++++++++++++++-------------------- nix/deps/clojure/deps.list | 33 ++-- package.json | 2 +- shadow-cljs.edn | 3 +- yarn.lock | 8 +- 5 files changed, 192 insertions(+), 235 deletions(-) diff --git a/nix/deps/clojure/deps.json b/nix/deps/clojure/deps.json index f6c66e778c..c1ade5f491 100644 --- a/nix/deps/clojure/deps.json +++ b/nix/deps/clojure/deps.json @@ -104,15 +104,15 @@ }, { - "path": "cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0", + "path": "cljsjs/react/17.0.1-0/react-17.0.1-0", "host": "https://repo.clojars.org", "pom": { - "sha1": "ff154f318e1f63061b5bd42d9a38fc8547360cb4", - "sha256": "166ynlrph7rx3nql0c85c37vcbcsnwbjamk71hw74rz451pgnncr" + "sha1": "d5d3681281585d981375fe7bb29362bfcd0d4449", + "sha256": "0rskh6mfq5h0l0wybs68w9v585a6zlnnfgrvsf5k3h51fk2p28da" }, "jar": { - "sha1": "d5c53eca9f3884402c76268b82e3828223dcbf90", - "sha256": "1530hwqpxzxfjm6dy77whqwjzzx79jpnd9xvnkxy1lnk7l7lj494" + "sha1": "726da8a9305a865df90d81e9a8d58f87ff0ee8bd", + "sha256": "0bfmvw8gk98vdf9azll6041r1jaz1pmb0dyb35cfc8dr3mmr4ag7" } }, @@ -130,15 +130,15 @@ }, { - "path": "cljsjs/react/17.0.1-0/react-17.0.1-0", + "path": "cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0", "host": "https://repo.clojars.org", "pom": { - "sha1": "d5d3681281585d981375fe7bb29362bfcd0d4449", - "sha256": "0rskh6mfq5h0l0wybs68w9v585a6zlnnfgrvsf5k3h51fk2p28da" + "sha1": "ff154f318e1f63061b5bd42d9a38fc8547360cb4", + "sha256": "166ynlrph7rx3nql0c85c37vcbcsnwbjamk71hw74rz451pgnncr" }, "jar": { - "sha1": "726da8a9305a865df90d81e9a8d58f87ff0ee8bd", - "sha256": "0bfmvw8gk98vdf9azll6041r1jaz1pmb0dyb35cfc8dr3mmr4ag7" + "sha1": "d5c53eca9f3884402c76268b82e3828223dcbf90", + "sha256": "1530hwqpxzxfjm6dy77whqwjzzx79jpnd9xvnkxy1lnk7l7lj494" } }, @@ -272,6 +272,32 @@ } }, + { + "path": "com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "7d5e372ff32c90095800f96d8308c41af0285a41", + "sha256": "1dj7p0m0kwnjvy1y3kq63zb6bw0azjf79i5xbccmy3wv63b1vqrg" + }, + "jar": { + "sha1": "7e060dd5b19431e6d198e91ff670644372f60fbd", + "sha256": "1hn5plp7iyl626h8mrra56sysfm2qannj1dapr1m5afwkb24vfk1" + } + }, + + { + "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "5e902aae26ac5c36f6420f689f43333129dd69e2", + "sha256": "10vzlnl8vbjv2jqf818wdb7kgy9c6qjka7fjmmi3vdpg1mcn6pv6" + }, + "jar": { + "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1", + "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf" + } + }, + { "path": "com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1", "host": "https://repo1.maven.org/maven2", @@ -402,32 +428,6 @@ } }, - { - "path": "com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "7d5e372ff32c90095800f96d8308c41af0285a41", - "sha256": "1dj7p0m0kwnjvy1y3kq63zb6bw0azjf79i5xbccmy3wv63b1vqrg" - }, - "jar": { - "sha1": "7e060dd5b19431e6d198e91ff670644372f60fbd", - "sha256": "1hn5plp7iyl626h8mrra56sysfm2qannj1dapr1m5afwkb24vfk1" - } - }, - - { - "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "5e902aae26ac5c36f6420f689f43333129dd69e2", - "sha256": "10vzlnl8vbjv2jqf818wdb7kgy9c6qjka7fjmmi3vdpg1mcn6pv6" - }, - "jar": { - "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1", - "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf" - } - }, - { "path": "com/ibm/icu/icu4j/66.1/icu4j-66.1", "host": "https://repo1.maven.org/maven2", @@ -441,6 +441,58 @@ } }, + { + "path": "commons-codec/commons-codec/1.10/commons-codec-1.10", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e", + "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x" + }, + "jar": { + "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8", + "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2" + } + }, + + { + "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "65112009d674333c1acfafb4e198ff250d710764", + "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8" + }, + "jar": { + "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0", + "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54" + } + }, + + { + "path": "commons-io/commons-io/2.6/commons-io-2.6", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1", + "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc" + }, + "jar": { + "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf", + "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq" + } + }, + + { + "path": "compojure/compojure/1.5.2/compojure-1.5.2", + "host": "https://repo.clojars.org", + "pom": { + "sha1": "9e8da477b6682094d56802cb155291a2acb829bd", + "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx" + }, + "jar": { + "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439", + "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf" + } + }, + { "path": "com/taoensso/encore/2.105.0/encore-2.105.0", "host": "https://repo.clojars.org", @@ -519,58 +571,6 @@ } }, - { - "path": "commons-codec/commons-codec/1.10/commons-codec-1.10", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "44b9477418d2942d45550f7e7c66c16262062d0e", - "sha256": "1yscxabk7i59vgfjg7c1y3prj39h1d8prnwgxbisc4ni29qdpf5x" - }, - "jar": { - "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8", - "sha256": "0scm6321zz76dc3bs8sy2qyami755lz4lq5455gl67bi9slxyha2" - } - }, - - { - "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "65112009d674333c1acfafb4e198ff250d710764", - "sha256": "007nyd66fqp3fbrmnsbfp1fpkhmr2lk33qmkp3salqld3xd7qlc8" - }, - "jar": { - "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0", - "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54" - } - }, - - { - "path": "commons-io/commons-io/2.6/commons-io-2.6", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "5060835593e5b6ed18c82fc2e782f0a3c30a00b1", - "sha256": "0q4a6fp6xkyd86ikymkyv2plhf9vj8aqvggxg9d1yad2jcw8c8qc" - }, - "jar": { - "sha1": "815893df5f31da2ece4040fe0a12fd44b577afaf", - "sha256": "04v5fg53jl9gbn6pyz3l7kbpxv0xjzyasnw6yd1a3hhacq2d6xzq" - } - }, - - { - "path": "compojure/compojure/1.5.2/compojure-1.5.2", - "host": "https://repo.clojars.org", - "pom": { - "sha1": "9e8da477b6682094d56802cb155291a2acb829bd", - "sha256": "036z64iprypccz03iq7lqxvw99xjh4xlsfmfwbs37pmhfnfmbdnx" - }, - "jar": { - "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439", - "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf" - } - }, - { "path": "crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0", "host": "https://repo.clojars.org", @@ -649,19 +649,6 @@ } }, - { - "path": "hawk/hawk/0.2.11/hawk-0.2.11", - "host": "https://repo.clojars.org", - "pom": { - "sha1": "02bbacfd1011c61632de21741f9b331f1c6125b6", - "sha256": "0n64r1dmmdr5sv95jn8nhh3rgsn3x49qlminv7b9sqylc6hz70xb" - }, - "jar": { - "sha1": "f5d26a671528f2c975f0df2cc8bc4b9bd800208d", - "sha256": "0hvsk8yagkizl6xif2api42f8cazvn8www0fnakcbil7qkqg4hz9" - } - }, - { "path": "hiccup/hiccup/1.0.5/hiccup-1.0.5", "host": "https://repo.clojars.org", @@ -805,32 +792,6 @@ } }, - { - "path": "net/incongru/watchservice/barbary-watchservice/1.0/barbary-watchservice-1.0", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "e84fee8e5076b47153bbe3a937588a4175b97056", - "sha256": "1ky2s6ll8wk47i5xz78dzz583iyg30zhbigq1n47hlbdm4fv3cwk" - }, - "jar": { - "sha1": "490d389d7a2fb76eaa5842c9606d778a60f5b45e", - "sha256": "1d9s4vc1h51sjkrqjmyijp3ryzpy9gcl6kp1yqaqag09haywmijl" - } - }, - - { - "path": "net/java/dev/jna/jna/3.2.2/jna-3.2.2", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "df7f15de037a1ee4d57d2ed779739089f560338c jna-3.2.2.pom", - "sha256": "1564z8h6nzs1irpq96f037c3045pj4r9x8c7d54nc4zbkww1p05l" - }, - "jar": { - "sha1": "d2598c4f68d43dc96b0ffa60e75baa54845596fe", - "sha256": "0xfqm56ifw1j5qh2vl3ja7sliid71xhk6zfdz3r1q35cpxpig3zy" - } - }, - { "path": "nrepl/nrepl/0.7.0/nrepl-0.7.0", "host": "https://repo.clojars.org", @@ -974,19 +935,6 @@ } }, - { - "path": "org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "1aa0b32fd70e6644dcb06b88b55630d6bbb6f188", - "sha256": "1wq6gvhlvy3mdhj1cb0w62kclqd7x42dqd0275l40rlla5q5h1z1" - }, - "jar": { - "sha1": "4fc15daa4fd1b150e8c6d32755796634446dd86a", - "sha256": "1ykw162gng0lcbxn2f387vv1l4d7hfwyayhxgzqqgi9jx211fzw5" - } - }, - { "path": "org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f", "host": "https://repo1.maven.org/maven2", @@ -1000,6 +948,19 @@ } }, + { + "path": "org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "1aa0b32fd70e6644dcb06b88b55630d6bbb6f188", + "sha256": "1wq6gvhlvy3mdhj1cb0w62kclqd7x42dqd0275l40rlla5q5h1z1" + }, + "jar": { + "sha1": "4fc15daa4fd1b150e8c6d32755796634446dd86a", + "sha256": "1ykw162gng0lcbxn2f387vv1l4d7hfwyayhxgzqqgi9jx211fzw5" + } + }, + { "path": "org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176", "host": "https://repo1.maven.org/maven2", @@ -1026,19 +987,6 @@ } }, - { - "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "3f21bdbd549557232eb0bf0965b2beea34004d52", - "sha256": "0cyyhf82pn4mjw4whr4sx3cnxrgsk862dq92gn79yawxr6842i51" - }, - "jar": { - "sha1": "027d2ebe594eb5f46d6bcea62593e184937b3011", - "sha256": "0kcfcn12dmyrm7sk1jkrlcb7ws8kazfqziv62mfid62xc095gayz" - } - }, - { "path": "org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0", "host": "https://repo1.maven.org/maven2", @@ -1052,6 +1000,19 @@ } }, + { + "path": "org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "3f21bdbd549557232eb0bf0965b2beea34004d52", + "sha256": "0cyyhf82pn4mjw4whr4sx3cnxrgsk862dq92gn79yawxr6842i51" + }, + "jar": { + "sha1": "027d2ebe594eb5f46d6bcea62593e184937b3011", + "sha256": "0kcfcn12dmyrm7sk1jkrlcb7ws8kazfqziv62mfid62xc095gayz" + } + }, + { "path": "org/clojure/tools.cli/1.0.194/tools.cli-1.0.194", "host": "https://repo1.maven.org/maven2", @@ -1117,19 +1078,6 @@ } }, - { - "path": "org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "020bac4e8232f0b051e3e6b8033f67653cf9c685", - "sha256": "1avd7kmwh0i6nkcirwl358a6lkpqwara0f5a7qiw1fjivc81qmzq" - }, - "jar": { - "sha1": "a4accb1ced82da8d61bd2928f435de8af548dc2b", - "sha256": "03001wa3xs08lw2rz27w5s0fyspyhkiiarqsrq9yf8gfysmnik2s" - } - }, - { "path": "org/graalvm/js/js/20.1.0/js-20.1.0", "host": "https://repo1.maven.org/maven2", @@ -1143,6 +1091,19 @@ } }, + { + "path": "org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "020bac4e8232f0b051e3e6b8033f67653cf9c685", + "sha256": "1avd7kmwh0i6nkcirwl358a6lkpqwara0f5a7qiw1fjivc81qmzq" + }, + "jar": { + "sha1": "a4accb1ced82da8d61bd2928f435de8af548dc2b", + "sha256": "03001wa3xs08lw2rz27w5s0fyspyhkiiarqsrq9yf8gfysmnik2s" + } + }, + { "path": "org/graalvm/regex/regex/20.1.0/regex-20.1.0", "host": "https://repo1.maven.org/maven2", @@ -1273,6 +1234,19 @@ } }, + { + "path": "org/ow2/asm/asm/7.1/asm-7.1", + "host": "https://repo1.maven.org/maven2", + "pom": { + "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7", + "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g" + }, + "jar": { + "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e", + "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja" + } + }, + { "path": "org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1", "host": "https://repo1.maven.org/maven2", @@ -1325,19 +1299,6 @@ } }, - { - "path": "org/ow2/asm/asm/7.1/asm-7.1", - "host": "https://repo1.maven.org/maven2", - "pom": { - "sha1": "7e40eb6619fd20bd7d98bf775bfdd810aec87ac7", - "sha256": "101i3pyrq082kjyz413hfqwkjjsyfnk9kx3rqr38ln56mlp78a8g" - }, - "jar": { - "sha1": "fa29aa438674ff19d5e1386d2c3527a0267f291e", - "sha256": "1pnlb1ick32bihpzc599xl9ppd07qhls6pm0xaqwrj9cdlmzmcja" - } - }, - { "path": "org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final", "host": "https://repo1.maven.org/maven2", @@ -1390,6 +1351,19 @@ } }, + { + "path": "reagent/reagent/1.0.0/reagent-1.0.0", + "host": "https://repo.clojars.org", + "pom": { + "sha1": "93ad5ccb0101108fb0843a3f2c50da28f8fd8336", + "sha256": "1l4xzgc4wbd8b29mhj5j336cf8w1zccaia0w413zf3bnj6jf5m38" + }, + "jar": { + "sha1": "a1dd4d40425bb2e1afad0fe72780b43ff394ccfa", + "sha256": "1g607s1ymns85923bvhwrsj0y5czyqqq1jmxx0a58fnsm1b318fa" + } + }, + { "path": "re-com/re-com/2.8.0/re-com-2.8.0", "host": "https://repo.clojars.org", @@ -1403,6 +1377,19 @@ } }, + { + "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0", + "host": "https://repo.clojars.org", + "pom": { + "sha1": "0bce30b420249ba7e4b90cbb3e046b4bb5416389", + "sha256": "0zmg5qc8d55pry7832isiwd2q237znfjqjpxchd2hvlpalh5qnva" + }, + "jar": { + "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207", + "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i" + } + }, + { "path": "re-frame/re-frame/0.12.0/re-frame-0.12.0", "host": "https://repo.clojars.org", @@ -1442,32 +1429,6 @@ } }, - { - "path": "reagent/reagent/1.0.0/reagent-1.0.0", - "host": "https://repo.clojars.org", - "pom": { - "sha1": "93ad5ccb0101108fb0843a3f2c50da28f8fd8336", - "sha256": "1l4xzgc4wbd8b29mhj5j336cf8w1zccaia0w413zf3bnj6jf5m38" - }, - "jar": { - "sha1": "a1dd4d40425bb2e1afad0fe72780b43ff394ccfa", - "sha256": "1g607s1ymns85923bvhwrsj0y5czyqqq1jmxx0a58fnsm1b318fa" - } - }, - - { - "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0", - "host": "https://repo.clojars.org", - "pom": { - "sha1": "0bce30b420249ba7e4b90cbb3e046b4bb5416389", - "sha256": "0zmg5qc8d55pry7832isiwd2q237znfjqjpxchd2hvlpalh5qnva" - }, - "jar": { - "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207", - "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i" - } - }, - { "path": "rewrite-clj/rewrite-clj/0.6.1/rewrite-clj-0.6.1", "host": "https://repo.clojars.org", @@ -1573,15 +1534,15 @@ }, { - "path": "thheller/shadow-cljs/2.11.4/shadow-cljs-2.11.4-aot", + "path": "thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot", "host": "https://repo.clojars.org", "pom": { - "sha1": "6c2f23a8062ba42dd9ffb22124e5a28df78a248a", - "sha256": "043b63g5naqwc2if42krxiidz7319v7ic80yiyrm6pyy20xv2sz0" + "sha1": "c06750fa2103c3ade8e9580034401d7379558768", + "sha256": "09m0yl56b2ld1a9031x6x3wlzys608hfzdf87hrnmpihg8khq5ph" }, "jar": { - "sha1": "5d2e4e955ab1a108e2ebc0c9b87ba78f8be4edbc", - "sha256": "1mz4h9r4x1qaxqdi1jadlx2j1qha0v25jsswwp9rb0vi3jvjqhws" + "sha1": "6da05fd411b96fa939fa4df19aa28c0a37b0a87d", + "sha256": "1w6xm7bfg216cygmc4skns2laip3b7vp8nvgqmylpgna1k21mps2" } }, diff --git a/nix/deps/clojure/deps.list b/nix/deps/clojure/deps.list index 851c92e93c..ba20bde8a1 100644 --- a/nix/deps/clojure/deps.list +++ b/nix/deps/clojure/deps.list @@ -6,9 +6,9 @@ cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar cider/piggieback/0.4.1/piggieback-0.4.1.jar cljfmt/cljfmt/0.6.7/cljfmt-0.6.7.jar cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar -cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0.jar -cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0.jar cljsjs/react/17.0.1-0/react-17.0.1-0.jar +cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0.jar +cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0.jar clout/clout/2.1.2/clout-2.1.2.jar com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar com/bhauman/cljs-test-display/0.1.1/cljs-test-display-0.1.1.jar @@ -19,6 +19,8 @@ com/cognitect/transit-js/0.8.846/transit-js-0.8.846.jar com/fasterxml/jackson/core/jackson-core/2.8.7/jackson-core-2.8.7.jar com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar com/google/code/gson/gson/2.7/gson-2.7.jar +com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar +com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar com/google/elemental2/elemental2-core/1.0.0-RC1/elemental2-core-1.0.0-RC1.jar com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.jar com/google/guava/guava/25.1-jre/guava-25.1-jre.jar @@ -29,26 +31,23 @@ com/google/jsinterop/base/1.0.0/base-1.0.0.jar com/google/jsinterop/jsinterop-annotations/1.0.2/jsinterop-annotations-1.0.2.jar com/google/protobuf/protobuf-java/3.11.1/protobuf-java-3.11.1.jar com/google/re2j/re2j/1.3/re2j-1.3.jar -com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar -com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar com/ibm/icu/icu4j/66.1/icu4j-66.1.jar +commons-codec/commons-codec/1.10/commons-codec-1.10.jar +commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar +commons-io/commons-io/2.6/commons-io-2.6.jar +compojure/compojure/1.5.2/compojure-1.5.2.jar com/taoensso/encore/2.105.0/encore-2.105.0.jar com/taoensso/timbre/4.10.0/timbre-4.10.0.jar com/taoensso/truss/1.5.0/truss-1.5.0.jar com/taoensso/tufte/2.1.0/tufte-2.1.0.jar com/wsscode/pathom/2.2.31/pathom-2.2.31.jar com/wsscode/spec-inspec/1.0.0-alpha2/spec-inspec-1.0.0-alpha2.jar -commons-codec/commons-codec/1.10/commons-codec-1.10.jar -commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar -commons-io/commons-io/2.6/commons-io-2.6.jar -compojure/compojure/1.5.2/compojure-1.5.2.jar crypto-equality/crypto-equality/1.0.0/crypto-equality-1.0.0.jar crypto-random/crypto-random/1.2.0/crypto-random-1.2.0.jar day8/re-frame/test/0.1.5/test-0.1.5.jar edn-query-language/eql/0.0.9/eql-0.0.9.jar expound/expound/0.8.5/expound-0.8.5.jar fipp/fipp/0.6.23/fipp-0.6.23.jar -hawk/hawk/0.2.11/hawk-0.2.11.jar hiccup/hiccup/1.0.5/hiccup-1.0.5.jar hickory/hickory/0.7.1/hickory-0.7.1.jar http-kit/http-kit/2.2.0/http-kit-2.2.0.jar @@ -60,8 +59,6 @@ javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar medley/medley/0.8.2/medley-0.8.2.jar mvxcvi/alphabase/1.0.0/alphabase-1.0.0.jar net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar -net/incongru/watchservice/barbary-watchservice/1.0/barbary-watchservice-1.0.jar -net/java/dev/jna/jna/3.2.2/jna-3.2.2.jar nrepl/nrepl/0.7.0/nrepl-0.7.0.jar org/checkerframework/checker-qual/2.0.0/checker-qual-2.0.0.jar org/clojure/clojure/1.10.1/clojure-1.10.1.jar @@ -73,19 +70,19 @@ org/clojure/core.rrb-vector/0.1.1/core.rrb-vector-0.1.1.jar org/clojure/core.specs.alpha/0.2.44/core.specs.alpha-0.2.44.jar org/clojure/data.json/1.0.0/data.json-1.0.0.jar org/clojure/data.priority-map/1.0.0/data.priority-map-1.0.0.jar -org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f.jar org/clojure/google-closure-library/0.0-20191016-6ae1f72f/google-closure-library-0.0-20191016-6ae1f72f.jar +org/clojure/google-closure-library-third-party/0.0-20191016-6ae1f72f/google-closure-library-third-party-0.0-20191016-6ae1f72f.jar org/clojure/spec.alpha/0.2.176/spec.alpha-0.2.176.jar org/clojure/test.check/1.1.0/test.check-1.1.0.jar -org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0.jar +org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar org/clojure/tools.cli/1.0.194/tools.cli-1.0.194.jar org/clojure/tools.logging/0.4.1/tools.logging-0.4.1.jar org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar org/clojure/tools.reader/1.3.3/tools.reader-1.3.3.jar org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar -org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0.jar org/graalvm/js/js/20.1.0/js-20.1.0.jar +org/graalvm/js/js-scriptengine/20.1.0/js-scriptengine-20.1.0.jar org/graalvm/regex/regex/20.1.0/regex-20.1.0.jar org/graalvm/sdk/graal-sdk/20.1.0/graal-sdk-20.1.0.jar org/graalvm/truffle/truffle-api/20.1.0/truffle-api-20.1.0.jar @@ -96,21 +93,21 @@ org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar org/jsoup/jsoup/1.9.2/jsoup-1.9.2.jar org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar +org/ow2/asm/asm/7.1/asm-7.1.jar org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar org/ow2/asm/asm-util/7.1/asm-util-7.1.jar -org/ow2/asm/asm/7.1/asm-7.1.jar org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar prismatic/schema/1.1.7/schema-1.1.7.jar quoin/quoin/0.1.2/quoin-0.1.2.jar +reagent/reagent/1.0.0/reagent-1.0.0.jar re-com/re-com/2.8.0/re-com-2.8.0.jar +refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar re-frame/re-frame/0.12.0/re-frame-0.12.0.jar re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar re-frisk/sente/1.15.0/sente-1.15.0.jar -reagent/reagent/1.0.0/reagent-1.0.0.jar -refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar rewrite-clj/rewrite-clj/0.6.1/rewrite-clj-0.6.1.jar rewrite-cljs/rewrite-cljs/0.4.4/rewrite-cljs-0.4.4.jar ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar @@ -119,7 +116,7 @@ ring/ring-core/1.8.1/ring-core-1.8.1.jar spec-coerce/spec-coerce/1.0.0-alpha6/spec-coerce-1.0.0-alpha6.jar status-im/timbre/4.10.0-2-status/timbre-4.10.0-2-status.jar thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar -thheller/shadow-cljs/2.11.4/shadow-cljs-2.11.4-aot.jar +thheller/shadow-cljs/2.11.16/shadow-cljs-2.11.16-aot.jar thheller/shadow-cljsjs/0.0.21/shadow-cljsjs-0.0.21.jar thheller/shadow-util/0.7.0/shadow-util-0.7.0.jar viebel/codox-klipse-theme/0.0.1/codox-klipse-theme-0.0.1.jar diff --git a/package.json b/package.json index 2713825f91..19967cf8e5 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "nyc": "^14.1.1", "process": "0.11.10", "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status", - "shadow-cljs": "^2.10.14" + "shadow-cljs": "2.11.16" }, "binary": { "module_name": "status_nodejs_addon", diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 5a79ddb4e0..8d8f5b26dc 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -1,8 +1,7 @@ ;; shadow-cljs configuration {:source-paths ["src" "test/cljs"] - :dependencies [[org.clojure/core.async "1.1.587"] - [reagent "1.0.0"] + :dependencies [[reagent "1.0.0"] [re-frame "0.12.0"] [binaryage/oops "0.7.0"] [com.andrewmcveigh/cljs-time "0.5.2"] diff --git a/yarn.lock b/yarn.lock index 225f95588b..d1d8c57538 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8574,10 +8574,10 @@ shadow-cljs-jar@1.3.2: resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b" integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg== -shadow-cljs@^2.10.14: - version "2.11.4" - resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.4.tgz#11778b0cccd67be472f57278a0b870ed17ca878c" - integrity sha512-sIc1MfN/JsGenbFkDXs0+iVrKTSzAE5DzBFuUGxHc4LbcAJ9GWRQlAeE0WRT3fOCQQOlxeBLrxlZ6WiUjKlQgg== +shadow-cljs@2.11.16: + version "2.11.16" + resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.16.tgz#950fb32d3274adf9860ff2b7778faae6a095e4d2" + integrity sha512-KG9kaYZhwIcOrkDFjsKevJnfXzrjDe7wPKWzNydXVUxuba+Gr37iwAF1hvx41daj7+sT8hPdUzC7DV6HB5QChQ== dependencies: node-libs-browser "^2.2.1" readline-sync "^1.4.7"