From d133f576787d0cfeed8e73fe0d28874099873a25 Mon Sep 17 00:00:00 2001 From: Gheorghe Pinzaru Date: Wed, 13 May 2020 15:56:14 +0300 Subject: [PATCH] Remove source-map android debug Update flipper version android Disable source maps ios Signed-off-by: Gheorghe Pinzaru --- android/app/build.gradle | 2 +- android/gradle.properties | 2 +- mobile/js_files/package.json | 2 +- mobile/js_files/yarn.lock | 8 +- nix/deps/gradle/deps.list | 6 +- nix/deps/gradle/deps.nix | 363 ++++++++++++++++++++++++++++++----- nix/deps/gradle/deps.urls | 25 ++- shadow-cljs.edn | 6 +- 8 files changed, 354 insertions(+), 60 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d46695b735..2915ac6ce3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -294,7 +294,7 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' + exclude group:'com.facebook.fbjni' } debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { exclude group:'com.facebook.flipper' diff --git a/android/gradle.properties b/android/gradle.properties index 73a73e54cb..5d9598cc6e 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -48,4 +48,4 @@ org.gradle.jvmargs=-Xmx8704M versionCode=9999 # Flipper -FLIPPER_VERSION=0.33.1 \ No newline at end of file +FLIPPER_VERSION=0.35.0 \ No newline at end of file diff --git a/mobile/js_files/package.json b/mobile/js_files/package.json index d9ccc8ad04..36afd7d29f 100644 --- a/mobile/js_files/package.json +++ b/mobile/js_files/package.json @@ -68,6 +68,6 @@ "nyc": "^14.1.1", "process": "0.11.10", "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#v2.0.2-status", - "shadow-cljs": "2.8.99" + "shadow-cljs": "2.9.2" } } diff --git a/mobile/js_files/yarn.lock b/mobile/js_files/yarn.lock index 0cc2b11bc3..37caa92a15 100644 --- a/mobile/js_files/yarn.lock +++ b/mobile/js_files/yarn.lock @@ -7129,10 +7129,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.8.99: - version "2.8.99" - resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.8.99.tgz#877ae59de3ecd7b0510f63ca67555f6b1744fa3c" - integrity sha512-sfTrdJKeUKnD6GVc9/DDuM6CGOeHzg9x7/0/H7qIqTraT6pSdBbulygXrGY2egJ1moruk+E9s1NgU3tUyZ9PkA== +shadow-cljs@2.9.2: + version "2.9.2" + resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.9.2.tgz#e84b79a129c19b5134095da017a51fe6065e04ba" + integrity sha512-BuOWpM9jYarrIpDMkLWkeViXOSo+zLBRE7CzPetJa8aDnpohQ7jUeJMsX28S0uQ/rt+XSsElWqVGt3CiP6XjkA== dependencies: node-libs-browser "^2.0.0" readline-sync "^1.4.7" diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index c905d0b070..60ccae9222 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -299,9 +299,9 @@ com.android.tools:sdk-common:26.5.3 com.drewnoakes:metadata-extractor:2.11.0 com.facebook.conceal:conceal:1.1.3 com.facebook.fbjni:fbjni-java-only:0.0.3 -com.facebook.flipper:flipper-fresco-plugin:0.33.1 -com.facebook.flipper:flipper-network-plugin:0.33.1 -com.facebook.flipper:flipper:0.33.1 +com.facebook.flipper:flipper-fresco-plugin:0.35.0 +com.facebook.flipper:flipper-network-plugin:0.35.0 +com.facebook.flipper:flipper:0.35.0 com.facebook.fresco:animated-base:2.0.0 com.facebook.fresco:animated-drawable:2.0.0 com.facebook.fresco:animated-gif:2.0.0 diff --git a/nix/deps/gradle/deps.nix b/nix/deps/gradle/deps.nix index 56f2f5aae0..be9c7b164b 100644 --- a/nix/deps/gradle/deps.nix +++ b/nix/deps/gradle/deps.nix @@ -3818,51 +3818,6 @@ }; }; - "com/facebook/flipper/flipper-fresco-plugin/0.33.1/flipper-fresco-plugin-0.33.1" = - { - host = "https://plugins.gradle.org/m2"; - path = "com/facebook/flipper/flipper-fresco-plugin/0.33.1/flipper-fresco-plugin-0.33.1"; - type = "aar"; - pom = { - sha1 = "ca857ea50eb255b32a5f5f50db4f8b71845c8233"; - sha256 = "0qng3kdqmgrkkqnax1d3mdvar856c815fq168c6kis48b2sxh20i"; - }; - jar = { - sha1 = "7add6696db2c4f61106a8ac084210e9c69b8a52c"; - sha256 = "10azzfy88czry1ivk288rb40g5klqkpy0v7n5k1j2bhkg7pac2w6"; - }; - }; - - "com/facebook/flipper/flipper-network-plugin/0.33.1/flipper-network-plugin-0.33.1" = - { - host = "https://plugins.gradle.org/m2"; - path = "com/facebook/flipper/flipper-network-plugin/0.33.1/flipper-network-plugin-0.33.1"; - type = "aar"; - pom = { - sha1 = "3472d3295a65b774f582bc7b8d82cf38641614df"; - sha256 = "1ggw20hzr22c1bj5l70lp0zabf4kk7r6xwvxc6chrwn0mkm1mjsv"; - }; - jar = { - sha1 = "8a0846e672ecc4666054a2cb213060c74e20714e"; - sha256 = "06qp6a0rdj14icady2v4lqa2srg4il11y9kfdwvck9z4sfmdfrrh"; - }; - }; - - "com/facebook/flipper/flipper/0.33.1/flipper-0.33.1" = - { - host = "https://plugins.gradle.org/m2"; - path = "com/facebook/flipper/flipper/0.33.1/flipper-0.33.1"; - type = "aar"; - pom = { - sha1 = "ac06aa3761739fe8ffab76b1898650ad1d0e2fd4"; - sha256 = "0j7i7jmhh1lj5fp2ar9jg1ry7zyvjx5yyvxyni78khgsrj9wfvgf"; - }; - jar = { - sha1 = "b873b5080b747ecb8d60dfef99eae2178d5ee604"; - sha256 = "12n21sq04m1di114hg067zrx8mn24s9vrm0s1am4isd1ry16ch4g"; - }; - }; - "com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1" = { host = "https://plugins.gradle.org/m2"; @@ -3893,6 +3848,51 @@ }; }; + "com/facebook/flipper/flipper-fresco-plugin/0.35.0/flipper-fresco-plugin-0.35.0" = + { + host = "https://repository.sonatype.org/content/groups/sonatype-public-grid"; + path = "com/facebook/flipper/flipper-fresco-plugin/0.35.0/flipper-fresco-plugin-0.35.0"; + type = "aar"; + pom = { + sha1 = "083cf496f951d8647bdbbda62d2f89ccecc7d09c"; + sha256 = "19v1xi3ahqswxj7n8bjnxmn6hzv5i5fw6bjvdax1pl40zbvrn9dl"; + }; + jar = { + sha1 = "7add6696db2c4f61106a8ac084210e9c69b8a52c"; + sha256 = "10azzfy88czry1ivk288rb40g5klqkpy0v7n5k1j2bhkg7pac2w6"; + }; + }; + + "com/facebook/flipper/flipper-network-plugin/0.35.0/flipper-network-plugin-0.35.0" = + { + host = "https://repository.sonatype.org/content/groups/sonatype-public-grid"; + path = "com/facebook/flipper/flipper-network-plugin/0.35.0/flipper-network-plugin-0.35.0"; + type = "aar"; + pom = { + sha1 = "366a68d0df95951a73453d305b83fad53143b902"; + sha256 = "15xm3xpf6r4sfzi92jl1i26dsmlm888w7j06rrzc46zf0aymnwx9"; + }; + jar = { + sha1 = "5180a9a0456bccee56206713393878b964101e55"; + sha256 = "0ajhgyirpvmix5j0gdk174k272034inj037si925zdigglw5nh0q"; + }; + }; + + "com/facebook/flipper/flipper/0.35.0/flipper-0.35.0" = + { + host = "https://repository.sonatype.org/content/groups/sonatype-public-grid"; + path = "com/facebook/flipper/flipper/0.35.0/flipper-0.35.0"; + type = "aar"; + pom = { + sha1 = "b28f4d6d612d71b8e2245c03d9aa071a5846f007"; + sha256 = "1izvhfm11nvkzn592ws9sh16fmzgz2b5nzykrk6aqq4ajsk8j2nw"; + }; + jar = { + sha1 = "fd83813856440750c1fbce73f673f7769247357d"; + sha256 = "0ib1rwhs4xmyd6h99lwpjvkbxnqhgzy85kynfv15rsyw6wkv45fw"; + }; + }; + "com/github/status-im/function/0.0.1/function-0.0.1" = { host = "https://repository.sonatype.org/content/groups/sonatype-public-grid"; @@ -7001,6 +7001,21 @@ }; }; + "com/google/android/android/4.1.1.4/android-4.1.1.4" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "com/google/android/android/4.1.1.4/android-4.1.1.4"; + type = "jar"; + pom = { + sha1 = "469412c22dd395b960813c71d16c252595513d6c"; + sha256 = "097iq5s0y6bijxq9z5raj1djgg3mjwc3hck3d74jh6wkpi0fp51k"; + }; + jar = { + sha1 = "3fb039385e71e9aa2ba547ea9ea8caa34a4ffac7"; + sha256 = "1jyk9w5hwd2w34dynz5sdm29m4jlz07i0xvjkzwfy4dprd0ja1w4"; + }; + }; + "com/google/auto/auto-common/0.3/auto-common-0.3" = { host = "https://repo.maven.apache.org/maven2"; @@ -8453,6 +8468,51 @@ }; }; + "com/squareup/okhttp3/mockwebserver/3.12.1/mockwebserver-3.12.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "com/squareup/okhttp3/mockwebserver/3.12.1/mockwebserver-3.12.1"; + type = "jar"; + pom = { + sha1 = "fea7ef710abf839080391f467074c610cfb6a1b5"; + sha256 = "1pfx6skp39ql4b798vb8cfpay5pfd9ywg32mlgfx0m0ga7q85xxr"; + }; + jar = { + sha1 = "285880421051c9b6dc3bdb355deacdf999353bfe"; + sha256 = "1yh0fj38fywsq8706qz9cc3323ibrb7vw07m8mvcrn6i1c291zlw"; + }; + }; + + "com/squareup/okhttp3/okhttp-testing-support/3.12.1/okhttp-testing-support-3.12.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "com/squareup/okhttp3/okhttp-testing-support/3.12.1/okhttp-testing-support-3.12.1"; + type = "jar"; + pom = { + sha1 = "6d5a724b40195ef7b2ca9625439c58f167a74c22"; + sha256 = "07r17w01h3a4b1rbikhs07igsnvny3fgbxnl91dradmicbydx0pz"; + }; + jar = { + sha1 = "493be2ce0a9b62112dc0b35c3be0e76d63eaeb2a"; + sha256 = "192jg7fqws85divkcdjj2859lhajqvxspfpdf8d98s7cgrsj06k3"; + }; + }; + + "com/squareup/okhttp3/okhttp-tls/3.12.1/okhttp-tls-3.12.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "com/squareup/okhttp3/okhttp-tls/3.12.1/okhttp-tls-3.12.1"; + type = "jar"; + pom = { + sha1 = "3503aab6bea92dfefb4552128ed23f62dfba3897"; + sha256 = "0874bzl236371qwbq4l1pshkbykfsgfgv1w8z85wsr8g2d4qjwwd"; + }; + jar = { + sha1 = "5f82cf038319971376ba19d5157077caa9537f17"; + sha256 = "05m1aai95lg2kxjwz0qzv7vgk851k8b1zabh4syywhcxfxx223ii"; + }; + }; + "com/squareup/okhttp3/okhttp-urlconnection/3.12.1/okhttp-urlconnection-3.12.1" = { host = "https://repo.maven.apache.org/maven2"; @@ -11285,6 +11345,21 @@ }; }; + "org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1"; + type = "jar"; + pom = { + sha1 = "2bd89707ff72268b82c1a6ef901fe1a7cf42461b"; + sha256 = "1cji45wbnlmnv68m5mfmpa0ml15my8r27g0p3n30sw51lhjw1f2i"; + }; + jar = { + sha1 = "1d7d28fa738bdbfe4fbd895d9486308999bdf440"; + sha256 = "00rwar2fx17jvchk7qlxk9kk91q7dnq3ppjmlvcyb6kwvkmrc9bm"; + }; + }; + "org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2" = { host = "https://repo.maven.apache.org/maven2"; @@ -11405,6 +11480,17 @@ }; }; + "org/apache/httpcomponents/httpcomponents-client/4.0.1/httpcomponents-client-4.0.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/apache/httpcomponents/httpcomponents-client/4.0.1/httpcomponents-client-4.0.1"; + type = "pom"; + pom = { + sha1 = "caa8c590d68feb60218536f4ac95ed3338161791"; + sha256 = "05b5ygrq2bh7kq19lwpw9cddl0c3y50si3hf2p8pzkkp8ikzqp0s"; + }; + }; + "org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2" = { host = "https://repo.maven.apache.org/maven2"; @@ -16379,6 +16465,21 @@ }; }; + "org/apache/maven/plugins/maven-javadoc-plugin/3.0.1/maven-javadoc-plugin-3.0.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/apache/maven/plugins/maven-javadoc-plugin/3.0.1/maven-javadoc-plugin-3.0.1"; + type = "jar"; + pom = { + sha1 = "67926d198726faf4b9b816f5f098f754bebf3ac9"; + sha256 = "1z0hq86d1ql6b6zc9hxxs3bkdg8fw9i3844996rrcfz2i85f3lf9"; + }; + jar = { + sha1 = "c3196efee62d36bac6c32352fca0448a2d0dec99"; + sha256 = "1lc4g2cxabklih7vi68m6irf2757dskcnkgn42sl58rqkwbyh8jv"; + }; + }; + "org/apache/maven/plugins/maven-javadoc-plugin/3.2.0/maven-javadoc-plugin-3.2.0" = { host = "https://repo.maven.apache.org/maven2"; @@ -17528,6 +17629,21 @@ }; }; + "org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1"; + type = "jar"; + pom = { + sha1 = "7ebd2eb7c940e24207e910bf4f6491cd38acea5e"; + sha256 = "07cr7mhsjnf59phd3ff4adpjrd095l36kdzdr0445d0qmkmx1mcq"; + }; + jar = { + sha1 = "025468bdffb3d04eb051ca5e0b33d7e8bb10381e"; + sha256 = "0vaby8pqpl9s5249ny8hf6i2drphpgm7kx93xljzpqjfim9xs1jp"; + }; + }; + "org/apache/maven/plugins/maven-surefire-plugin/3.0.0-M3/maven-surefire-plugin-3.0.0-M3" = { host = "https://repo.maven.apache.org/maven2"; @@ -18883,6 +18999,17 @@ }; }; + "org/apache/maven/surefire/surefire/2.22.1/surefire-2.22.1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/apache/maven/surefire/surefire/2.22.1/surefire-2.22.1"; + type = "pom"; + pom = { + sha1 = "535508195981dabd311b01bb70daf7558eaf0ea4"; + sha256 = "093d1z6ggj83vqm3lv83jhz9ddm3yfzp2fx88d1n113301vad615"; + }; + }; + "org/apache/maven/surefire/surefire/3.0.0-M3/surefire-3.0.0-M3" = { host = "https://repo.maven.apache.org/maven2"; @@ -19800,6 +19927,21 @@ }; }; + "org/codehaus/mojo/animal-sniffer-annotations/1.15/animal-sniffer-annotations-1.15" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/codehaus/mojo/animal-sniffer-annotations/1.15/animal-sniffer-annotations-1.15"; + type = "jar"; + pom = { + sha1 = "619990be2896b620c1bd44c2a22736bac9313431"; + sha256 = "04n7mxyvk7xh4w4vavv0wwjq0b0rdwf36jcblp4apzrrd9gkd6am"; + }; + jar = { + sha1 = "3f19b51588ad71482ce4c169f54f697b6181d1b4"; + sha256 = "1hg2hp8b7b8yv9523mvdx14q1k963v9bpgqdhf9spd23rljp4700"; + }; + }; + "org/codehaus/mojo/animal-sniffer-annotations/1.17/animal-sniffer-annotations-1.17" = { host = "https://repo.maven.apache.org/maven2"; @@ -19875,6 +20017,21 @@ }; }; + "org/codehaus/mojo/animal-sniffer-maven-plugin/1.15/animal-sniffer-maven-plugin-1.15" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/codehaus/mojo/animal-sniffer-maven-plugin/1.15/animal-sniffer-maven-plugin-1.15"; + type = "jar"; + pom = { + sha1 = "6460c127c6971b09e2db479231c981836edd60af"; + sha256 = "1d2jlr33knc4cnclg8wnn9sdmywaqdjl40i69za03xiksvcsxr2m"; + }; + jar = { + sha1 = "7547a24a835c4c811045f28284bcc1b6e8bf1e42"; + sha256 = "022ky6rnqsppdg3rr4s6gizcqi9nx83l1lwa8fq4ig6fglz0i7hi"; + }; + }; + "org/codehaus/mojo/animal-sniffer-maven-plugin/1.16/animal-sniffer-maven-plugin-1.16" = { host = "https://repo.maven.apache.org/maven2"; @@ -19949,6 +20106,17 @@ }; }; + "org/codehaus/mojo/animal-sniffer-parent/1.15/animal-sniffer-parent-1.15" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/codehaus/mojo/animal-sniffer-parent/1.15/animal-sniffer-parent-1.15"; + type = "pom"; + pom = { + sha1 = "fd4ad95baa39049320fb399eff275266ee6adebe"; + sha256 = "1vq1m3hgyw8dg5p0j2hy9cagdvahyxqj0kv7yy7510wr3crc08bl"; + }; + }; + "org/codehaus/mojo/animal-sniffer-parent/1.16/animal-sniffer-parent-1.16" = { host = "https://repo.maven.apache.org/maven2"; @@ -20418,6 +20586,21 @@ }; }; + "org/codehaus/mojo/templating-maven-plugin/1.0-alpha-3/templating-maven-plugin-1.0-alpha-3" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/codehaus/mojo/templating-maven-plugin/1.0-alpha-3/templating-maven-plugin-1.0-alpha-3"; + type = "jar"; + pom = { + sha1 = "9ddf35a2c0c032c1c652f00cfd6b22643d6ec98a"; + sha256 = "04z8nlw88bkamjzl0p1vqj8rkxak7f4qjv4j9v9cybqf8k4znwd5"; + }; + jar = { + sha1 = "e9d69c141dbdebe79f60e6a99a3548676c11999d"; + sha256 = "0skc2671dzp83yiabf726fm6ynhpx8fan9c9mjxy37wyn0fkvj6l"; + }; + }; + "org/codehaus/mojo/templating-maven-plugin/1.0.0/templating-maven-plugin-1.0.0" = { host = "https://repo.maven.apache.org/maven2"; @@ -21969,6 +22152,36 @@ }; }; + "org/conscrypt/conscrypt-openjdk-uber/1.4.0/conscrypt-openjdk-uber-1.4.0" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/conscrypt/conscrypt-openjdk-uber/1.4.0/conscrypt-openjdk-uber-1.4.0"; + type = "jar"; + pom = { + sha1 = "fccecd4a4442f036ccf09133504c8b579fff526b"; + sha256 = "05gxk0qkq6vyql4rqx0mjn94w5i201xw8f17bwhpndgjy9gm417v"; + }; + jar = { + sha1 = "d542eeb9eb86e5ce5ff78dab6ffa39f441f87122"; + sha256 = "0qabmv05px9ddimckmrspnlq60v4s5c9dj6n4bvic4kkv4zzcz24"; + }; + }; + + "org/conscrypt/conscrypt-openjdk-uber/2.0.0/conscrypt-openjdk-uber-2.0.0" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/conscrypt/conscrypt-openjdk-uber/2.0.0/conscrypt-openjdk-uber-2.0.0"; + type = "jar"; + pom = { + sha1 = "9eec92fdbb14567f27dcff682c4c067e59f9793d"; + sha256 = "1jfwqlvraaq8rwmq0q13kiygf4gvkhzjh7dd1ix2lm9mkmg611qs"; + }; + jar = { + sha1 = "68ea07c806ad889de05a78a508a73adf69f4c33f"; + sha256 = "0750i4jpczbh31i9bb8nl2djzri37c0isv8j4h6ccl0wfyad2prx"; + }; + }; + "org/easymock/easymockclassextension/2.2.1/easymockclassextension-2.2.1" = { host = "https://repo.maven.apache.org/maven2"; @@ -23763,6 +23976,21 @@ }; }; + "org/json/json/20080701/json-20080701" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/json/json/20080701/json-20080701"; + type = "jar"; + pom = { + sha1 = "4bf5daa95eb5c12d753a359a3e00621fdc73d187"; + sha256 = "17qrwbvlhx7szrv49a3m4y0ycxbx88hr29lwf58bkxckhnfi0xxj"; + }; + jar = { + sha1 = "d652f102185530c93b66158b1859f35d45687258"; + sha256 = "1srq8qz6w2n30nkx5y9321m2mdizjl71nx8lk3s4g91dmfnxdb03"; + }; + }; + "org/jsoup/jsoup/1.6.3/jsoup-1.6.3" = { host = "https://repo.maven.apache.org/maven2"; @@ -24078,6 +24306,21 @@ }; }; + "org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1"; + type = "jar"; + pom = { + sha1 = "a59312565e85b5ab9ed116bb0270a177d2c05b78"; + sha256 = "16jmg68v81a2m0dcm9xhk39dswjzzr2nbalmfirjv56pnfxi3amc"; + }; + jar = { + sha1 = "8827d279add29cf9115820671e7879de7bf80390"; + sha256 = "0ic1fqsi9gmlcz3a5vnv97p2qf21yy4cslxlk69fy1pp40r3j26c"; + }; + }; + "org/littleshoot/littleproxy/1.1.0-beta2/littleproxy-1.1.0-beta2" = { host = "https://repo.maven.apache.org/maven2"; @@ -26698,6 +26941,21 @@ }; }; + "xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2"; + type = "jar"; + pom = { + sha1 = "063f9f93725652dd11394c90dc746fb95b982a0d"; + sha256 = "1h92md3jsjyryn9yk1cfh00mk7gh4wzvxd5czrw9zkrw3wfr3xdp"; + }; + jar = { + sha1 = "065acede1e5305bd2b92213d7b5761328c6f4fd9"; + sha256 = "1rfpx609jnjppgkld1h4cc3wvx0xxd0i4qrjj9zccwxa3yz6fa0w"; + }; + }; + "xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1" = { host = "https://repo.maven.apache.org/maven2"; @@ -26773,6 +27031,21 @@ }; }; + "xpp3/xpp3/1.1.4c/xpp3-1.1.4c" = + { + host = "https://repo.maven.apache.org/maven2"; + path = "xpp3/xpp3/1.1.4c/xpp3-1.1.4c"; + type = "jar"; + pom = { + sha1 = "ab2e7aa30b06dc1a01218d17650e9966f65557da"; + sha256 = "0g8a1j151h1ijyfkm3kc0xfvbqq1y1l04r983v2vdy60blpn4m2f"; + }; + jar = { + sha1 = "9b988ea84b9e4e9f1874e390ce099b8ac12cfff5"; + sha256 = "1f9ifnxxj295xb1494jycbfm76476xm5l52p7608gf0v91d3jh83"; + }; + }; + "xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c" = { host = "https://repo.maven.apache.org/maven2"; diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index ad2c28c89e..3704915c9d 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -253,11 +253,11 @@ https://plugins.gradle.org/m2/com/android/tools/repository/25.2.3/repository-25. https://plugins.gradle.org/m2/com/android/tools/sdklib/25.2.3/sdklib-25.2.3 https://plugins.gradle.org/m2/com/android/tools/sdk-common/25.2.3/sdk-common-25.2.3 https://plugins.gradle.org/m2/com/facebook/fbjni/fbjni-java-only/0.0.3/fbjni-java-only-0.0.3 -https://plugins.gradle.org/m2/com/facebook/flipper/flipper-fresco-plugin/0.33.1/flipper-fresco-plugin-0.33.1 -https://plugins.gradle.org/m2/com/facebook/flipper/flipper-network-plugin/0.33.1/flipper-network-plugin-0.33.1 -https://plugins.gradle.org/m2/com/facebook/flipper/flipper/0.33.1/flipper-0.33.1 https://plugins.gradle.org/m2/com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1 https://plugins.gradle.org/m2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824 +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper-fresco-plugin/0.35.0/flipper-fresco-plugin-0.35.0 +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper-network-plugin/0.35.0/flipper-network-plugin-0.35.0 +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper/0.35.0/flipper-0.35.0 https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/function/0.0.1/function-0.0.1 https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/status-keycard-java/android/3.0.1/android-3.0.1 https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/status-keycard-java/lib/3.0.1/lib-3.0.1 @@ -478,6 +478,7 @@ https://repo.maven.apache.org/maven2/com/googlecode/jmockit/jmockit/1.6/jmockit- https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1 https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3 https://repo.maven.apache.org/maven2/com/googlecode/maven-download-plugin/download-maven-plugin/1.2.0/download-maven-plugin-1.2.0 +https://repo.maven.apache.org/maven2/com/google/android/android/4.1.1.4/android-4.1.1.4 https://repo.maven.apache.org/maven2/com/google/auto/auto-common/0.3/auto-common-0.3 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/2/auto-parent-2 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/3/auto-parent-3 @@ -587,6 +588,9 @@ https://repo.maven.apache.org/maven2/com/simpligility/maven/plugins/android-mave https://repo.maven.apache.org/maven2/com/simpligility/maven/progressive-organization-pom/6.0.0/progressive-organization-pom-6.0.0 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0 https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0 +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/mockwebserver/3.12.1/mockwebserver-3.12.1 +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-testing-support/3.12.1/okhttp-testing-support-3.12.1 +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-tls/3.12.1/okhttp-tls-3.12.1 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.12.1/okhttp-urlconnection-3.12.1 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.14.1/okhttp-3.14.1 @@ -799,6 +803,7 @@ https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/4.1.0/ https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/4.2.1/maven-bundle-plugin-4.2.1 https://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6 https://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.utils/1.6.0/org.apache.felix.utils-1.6.0 +https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.3/httpclient-4.1.3 @@ -807,6 +812,7 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.3.5/ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.6/httpclient-4.5.6 +https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.0.1/httpcomponents-client-4.0.1 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.1.1/httpcomponents-client-4.1.1 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.1.3/httpcomponents-client-4.1.3 @@ -1161,6 +1167,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plug https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/2.10/maven-javadoc-plugin-2.10 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.0.0-M1/maven-javadoc-plugin-3.0.0-M1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.0.0/maven-javadoc-plugin-3.0.0 +https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.0.1/maven-javadoc-plugin-3.0.1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin/3.2.0/maven-javadoc-plugin-3.2.0 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugins/3/maven-plugins-3 @@ -1244,6 +1251,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plu https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.20.1/maven-surefire-plugin-2.20.1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.21.0/maven-surefire-plugin-2.21.0 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.0/maven-surefire-plugin-2.22.0 +https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.22.1/maven-surefire-plugin-2.22.1 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/3.0.0-M3/maven-surefire-plugin-3.0.0-M3 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/3.0.0-M4/maven-surefire-plugin-3.0.0-M4 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-war-plugin/3.2.1/maven-war-plugin-3.2.1 @@ -1349,6 +1357,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.19.1/s https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.20.1/surefire-2.20.1 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.21.0/surefire-2.21.0 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.22.0/surefire-2.22.0 +https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.22.1/surefire-2.22.1 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/3.0.0-M3/surefire-3.0.0-M3 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/3.0.0-M4/surefire-3.0.0-M4 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-shared/2.7/wagon-http-shared-2.7 @@ -1416,17 +1425,20 @@ https://repo.maven.apache.org/maven2/org/codehaus/jackson/jackson-xc/1.9.2/jacks https://repo.maven.apache.org/maven2/org/codehaus/jsr166-mirror/jsr166y/1.7.0/jsr166y-1.7.0 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.10/animal-sniffer-annotations-1.10 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14 +https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.15/animal-sniffer-annotations-1.15 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.17/animal-sniffer-annotations-1.17 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.10/animal-sniffer-maven-plugin-1.10 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.11/animal-sniffer-maven-plugin-1.11 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.13/animal-sniffer-maven-plugin-1.13 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.14/animal-sniffer-maven-plugin-1.14 +https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.15/animal-sniffer-maven-plugin-1.15 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.16/animal-sniffer-maven-plugin-1.16 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.17/animal-sniffer-maven-plugin-1.17 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.10/animal-sniffer-parent-1.10 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.11/animal-sniffer-parent-1.11 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.13/animal-sniffer-parent-1.13 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14/animal-sniffer-parent-1.14 +https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.15/animal-sniffer-parent-1.15 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.16/animal-sniffer-parent-1.16 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.17/animal-sniffer-parent-1.17 https://repo.maven.apache.org/maven2/org/codehaus/mojo/buildnumber-maven-plugin/1.0/buildnumber-maven-plugin-1.0 @@ -1462,6 +1474,7 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/38/mojo-paren https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/40/mojo-parent-40 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo/7/mojo-7 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo/17/mojo-17 +https://repo.maven.apache.org/maven2/org/codehaus/mojo/templating-maven-plugin/1.0-alpha-3/templating-maven-plugin-1.0-alpha-3 https://repo.maven.apache.org/maven2/org/codehaus/mojo/templating-maven-plugin/1.0.0/templating-maven-plugin-1.0.0 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/1.0-alpha-12/plexus-archiver-1.0-alpha-12 @@ -1575,6 +1588,8 @@ https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3/plexus-3.3 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/4.0/plexus-4.0 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/5.0/plexus-5.0 https://repo.maven.apache.org/maven2/org/conscrypt/conscrypt-android/2.0.0/conscrypt-android-2.0.0 +https://repo.maven.apache.org/maven2/org/conscrypt/conscrypt-openjdk-uber/1.4.0/conscrypt-openjdk-uber-1.4.0 +https://repo.maven.apache.org/maven2/org/conscrypt/conscrypt-openjdk-uber/2.0.0/conscrypt-openjdk-uber-2.0.0 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/2.2.1/easymockclassextension-2.2.1 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.3/easymock-parent-3.3 @@ -1701,6 +1716,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.2.71/kot https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.3.20/kotlin-test-1.3.20 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.3.50/kotlin-test-1.3.50 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50 +https://repo.maven.apache.org/maven2/org/json/json/20080701/json-20080701 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.6.3/jsoup-1.6.3 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.7.2/jsoup-1.7.2 https://repo.maven.apache.org/maven2/org/junit-pioneer/junit-pioneer/0.3.0/junit-pioneer-0.3.0 @@ -1722,6 +1738,7 @@ https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-suite-api https://repo.maven.apache.org/maven2/org/junit/vintage/junit-vintage-engine/5.2.0/junit-vintage-engine-5.2.0 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7 https://repo.maven.apache.org/maven2/org/kathrynhuxtable/maven/wagon/wagon-gitsite/0.3.1/wagon-gitsite-0.3.1 +https://repo.maven.apache.org/maven2/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1 https://repo.maven.apache.org/maven2/org/littleshoot/littleproxy/1.1.0-beta2/littleproxy-1.1.0-beta2 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/1.10.16/mockito-core-1.10.16 @@ -1919,9 +1936,11 @@ https://repo.maven.apache.org/maven2/xalan/serializer/2.7.2/serializer-2.7.2 https://repo.maven.apache.org/maven2/xalan/xalan/2.7.2/xalan-2.7.2 https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1 https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.11.0/xercesImpl-2.11.0 +https://repo.maven.apache.org/maven2/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2 https://repo.maven.apache.org/maven2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1 https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2 https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04 https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01 https://repo.maven.apache.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2 +https://repo.maven.apache.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c https://repo.maven.apache.org/maven2/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c diff --git a/shadow-cljs.edn b/shadow-cljs.edn index f5b7063069..94ad11f18d 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -39,7 +39,8 @@ :dev {:devtools {:after-load status-im.reloader/reload :preloads [re-frisk-remote.preload]} :compiler-options {:closure-defines - {re-frame.trace/trace-enabled? true}} + {re-frame.trace/trace-enabled? true} + :source-map false} ;; if you want to use a real device, set your local ip ;; in the SHADOW_HOST env variable to make sure that ;; it will use the right interface @@ -61,7 +62,8 @@ :dev {:devtools {:after-load status-im.reloader/reload :preloads [re-frisk-remote.preload]} :compiler-options {:closure-defines - {re-frame.trace/trace-enabled? true}} + {re-frame.trace/trace-enabled? true} + :source-map false} ;; if you want to use a real device, set your local ip ;; in the SHADOW_HOST env variable to make sure that ;; it will use the right interface