From 3dd532c65669a812f3b83f4fade1430b401ad351 Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <roman.wolosovskyi@gmail.com>
Date: Tue, 9 Oct 2018 12:53:49 +0300
Subject: [PATCH] fix "DexArchiveMergerException: Unable to merge dex" by
 requesting status-im:function via jitpack

---
 Makefile                                      |   1 +
 android/app/build.gradle                      |   2 +-
 android/app/libs/function-0.0.1.jar           | Bin 2141 -> 0 bytes
 mobile_files/package-lock.json                | 471 +++++++++++++++++-
 mobile_files/package.json                     |   4 +-
 .../react-native-status/android/build.gradle  |   2 +-
 6 files changed, 475 insertions(+), 5 deletions(-)
 delete mode 100644 android/app/libs/function-0.0.1.jar

diff --git a/Makefile b/Makefile
index 99d8de383a..8a6d26039a 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,7 @@ $(STATUS_GO_IOS_ARCH):
 	cd $(RCTSTATUS_DIR) && curl -OL "$(GITHUB_URL)/v$(STATUS_GO_VER)/status-go-ios-$(STATUS_GO_VER).zip"
 
 $(STATUS_GO_DRO_ARCH):
+	mkdir -p $(ANDROID_LIBS_DIR)
 	cd $(ANDROID_LIBS_DIR) && curl -OL "$(GITHUB_URL)/v$(STATUS_GO_VER)/status-go-$(STATUS_GO_VER).aar"
 
 prepare-ios: $(STATUS_GO_IOS_ARCH) _prepare-mobile ##@prepare Install and prepare iOS-specific dependencies
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c60be5d4a3..56db4c0b6d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -256,7 +256,7 @@ dependencies {
     implementation project(':react-native-keychain')
     implementation project(':instabug-reactnative')
 
-    implementation 'status-im:function:0.0.1'
+    compile 'com.github.status-im:function:0.0.1'
     implementation fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
 }
 
diff --git a/android/app/libs/function-0.0.1.jar b/android/app/libs/function-0.0.1.jar
deleted file mode 100644
index ce72f6914feac21ce6fc5329a7a576310da79da6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2141
zcmWIWW@h1H0D+aR<=$Whl;8x?zOEsTx}JV+`T<a791JUf%8aVE{we@Uw*s*UvNB&s
zKTkK;;1E4ux6i(3PWyQ4>RsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s
zDiu5Dco`RamCV&zEApv(vv9YU5m2Z*NZ30l_&`%1Yv)PHm0bHeQ&(1U9jjWV5bPKg
zRI)c{ljF9C7m`P$XU+If^s$JM0p>ymhUI7;VFtP|GZ*d!Oa&nS0~HjPB$kvG<54G!
zqAs;0Bef{C6raH|*fpe;<|UV8=I6n!;sCo@^Mrfe2A~cZMg|5g0y^EGM(8EyBo-H2
zf6c#c$HvCy%qCaHrdP(6=f-yJNK?}sFE=(*-uY{eY;yTK=g6Lt+W$+|TzMjt?dzlH
z#&+((nJ;^eOuDov#Ep%wcY;9n*$D~@HuU;-h%Wo2pp#T~!{;g2IelF(ztYoZ7^P0X
z4x2SSX41_0%h`iYo>(wx=IZzurY)Nz?6;~YZ`Igp5^m4C%0+(Jw26)kcVo=l*xcCE
z*aQ+%5>pb=5*R;4HrlAMnJKhwxFKnAz(gG>uFw-5KhWRsM3<XbmWl`@%oHk#sTdN6
zx+u|&Zif;+ZCK*Q6quftKb*GnDNx^hVBBaDrN1CQSFa*Br*(pN{$T}ymiK?Sj@(^y
z_gg^Zj5}JPURS(oSA@58I*T4)`t#$b>I9dU3$@JC_TQA$y}jmHNBYy|vTe$|YdOQh
zcE#OZs4V~9|EluMf+KG4_f74wxM)`LMBwoaCJ94r@1q(|90Q-TSJd7-$h`KlSc|@X
z^exjDt8*j8cHK!o92;x?Ve9REOL^TwZnbHw3EBQ_!R-mlqt#u{nEvlQUN4yaqB|nB
zZ<+l=%O1(=s~@NDWH}$qw%;UV$HCp1HSa33q?QL{9)6%C>hNR5cc)`2Z`8H@r%K-G
zXtlaOXMU6k&$Dcfq=J2B?)I>}2PqwHEWA*e1`Hz*HXu5z3X1XzQj1D5Q;UPk{Lgyp
zdg*xj270Ut`QWSLefDt>-${+o52y8m4UEDJHf%65+-hVJTu{avXkcVu@>~mA#F$<%
zzF_>sOaGL<?gyWZx_X{En!4A{o_Xq}qjl29+eeR)YuVIis?!;+g3Aj=CJ|=bMIX@N
zKp?>I))7R*(`0}*OdIy15TqCcmNcpZNw_wof)QZ?W=RApsvrPl@kt;PoRVQyVrqc6
zAEX7O;T1#!ydcA^4^)&v07#z@FjXT8K%{~Vw*jD{4Pk&Yb_0+y6U-#+MIFqnC5^QN
zOhPUAki!x^n}doH2oPZS|G$(8DK=mQ3(Qg2ix!0DMVOkA3mV+UfQlM~F*orUgEg$M
z6+JK$mo!QOlM6hBLHvYp7Ti2&L4*h@?70+StSbw##v<};fHx}}$OIlB^aDEUC(sNA
F1_1T^S@Zw^

diff --git a/mobile_files/package-lock.json b/mobile_files/package-lock.json
index fa46943170..33e9eca941 100644
--- a/mobile_files/package-lock.json
+++ b/mobile_files/package-lock.json
@@ -4818,6 +4818,468 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "fsevents": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "optional": true,
+      "requires": {
+        "nan": "2.11.1",
+        "node-pre-gyp": "0.10.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.5.1",
+          "bundled": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.21",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "2.1.2"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.21",
+            "sax": "1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.10.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.0",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.1.10",
+            "npmlog": "4.1.2",
+            "rc": "1.2.7",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "tar": "4.4.1"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.3"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.7",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.5.1",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "chownr": "1.0.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.2.4",
+            "minizlib": "1.1.0",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true
+        }
+      }
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -7166,6 +7628,12 @@
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
+    "nan": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
+      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+      "optional": true
+    },
     "nano-json-stream-parser": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz",
@@ -8505,7 +8973,7 @@
       }
     },
     "react-native-webview-bridge": {
-      "version": "git+https://github.com/status-im/react-native-webview-bridge.git#601d0f8e92f62b3895550d2f6d6cf3fec7e74881",
+      "version": "git+https://github.com/status-im/react-native-webview-bridge.git#076863f7c1cd80530ef4c5d35293656d4783da29",
       "requires": {
         "invariant": "2.2.0",
         "keymirror": "0.1.1"
@@ -9000,6 +9468,7 @@
         "capture-exit": "1.2.0",
         "exec-sh": "0.2.2",
         "fb-watchman": "2.0.0",
+        "fsevents": "1.2.4",
         "micromatch": "3.1.10",
         "minimist": "1.2.0",
         "walker": "1.0.7",
diff --git a/mobile_files/package.json b/mobile_files/package.json
index becbae7fd0..609fe0824e 100644
--- a/mobile_files/package.json
+++ b/mobile_files/package.json
@@ -9,8 +9,8 @@
     "@babel/generator": "7.0.0",
     "@babel/helper-builder-react-jsx": "7.0.0",
     "@babel/plugin-transform-block-scoping": "7.0.0",
-    "@babel/register": "7.0.0",
     "@babel/preset-env": "7.1.0",
+    "@babel/register": "7.0.0",
     "@tradle/react-native-http": "2.0.1",
     "assert": "1.4.1",
     "asyncstorage-down": "4.0.1",
@@ -61,7 +61,7 @@
     "react-native-tcp": "https://github.com/status-im/react-native-tcp.git#3.3.0-1",
     "react-native-testfairy": "https://github.com/status-im/react-native-testfairy.git#2.14.1-1",
     "react-native-udp": "https://github.com/status-im/react-native-udp.git#2.3.1-1",
-    "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#0.33.16-1",
+    "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#0.33.16-2",
     "react-navigation": "^2.12.1",
     "realm": "2.16.1",
     "rn-snoopy": "https://github.com/status-im/rn-snoopy.git",
diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle
index b3234b10fa..ec0d695973 100644
--- a/modules/react-native-status/android/build.gradle
+++ b/modules/react-native-status/android/build.gradle
@@ -19,7 +19,7 @@ android {
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.instabug.library:instabug:3+'
-    implementation 'status-im:function:0.0.1'
+    compile 'com.github.status-im:function:0.0.1'
 
     // WARNING: If you change this, make sure the GitHub release of the .aar exists.
     // WARNING: status-go is downloaded in Makefile and has a hardcoded version too.