From 0d68f1a24b38b1b68833a88de1e1fbffe4a4d157 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Mon, 29 Apr 2019 21:07:58 +0100 Subject: [PATCH] update react native video version --- app/package-lock.json | 52 +++++++++++-------- app/package.json | 4 +- .../lbry/build/templates/build.tmpl.gradle | 5 ++ 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index d51fbf6c..1a8c2474 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -956,11 +956,11 @@ "integrity": "sha1-p4di+9rftSl76ZsV01p4Wy8JW/c=" }, "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.6.tgz", + "integrity": "sha512-QsaoUD2dpVpjENy8JFpQnXP9vyzoZPmAoKrE3S6HtSB7qzSebkJNnmdY4p004FQUSSiHXPueENpoeuUW/7a8Ig==", "requires": { - "mime-types": "~2.1.18", + "mime-types": "~2.1.24", "negotiator": "0.6.1" } }, @@ -3517,9 +3517,9 @@ "integrity": "sha1-qG5e5r2qFgVEddp5fM3fDFVphJE=" }, "eventemitter3": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.1.tgz", + "integrity": "sha512-MXmFv3KYbv7MPjPeGlFCTieXB9zNvmHfy4fXzZbrdMeUUk3pxQ8SS0cJ6CcwUDZnIL3ZDa01qQFzhlusB8s51Q==" }, "exec-sh": { "version": "0.2.2", @@ -3796,9 +3796,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.8.tgz", - "integrity": "sha512-tPvHgPGB7m40CZ68xqFGkKuzN+RnpGmSV+hgeKxhRpbxdqKXUFJGC3yonBOLzQBcJyGpdZFDfCsdOC2KFsXzeA==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", + "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", "optional": true, "requires": { "nan": "^2.12.1", @@ -4823,8 +4823,8 @@ } }, "lbry-redux": { - "version": "github:lbryio/lbry-redux#17389f806d1b3d266e8cfcd9c8973c81eec2be4b", - "from": "github:lbryio/lbry-redux#claim-search-fix", + "version": "github:lbryio/lbry-redux#4b3769fc2dcc4c93771aa4c5dbb64d0e97f6375f", + "from": "github:lbryio/lbry-redux", "requires": { "proxy-polyfill": "0.1.6", "reselect": "^3.0.0", @@ -4832,8 +4832,8 @@ } }, "lbryinc": { - "version": "github:lbryio/lbryinc#bec7ce1fba7fb0d90f604170ee00c75b3d8ab7ed", - "from": "github:lbryio/lbryinc#sdk-0.36-changes", + "version": "github:lbryio/lbryinc#a8fd592c46abb65410785fd0242e91904c158fd7", + "from": "github:lbryio/lbryinc", "requires": { "reselect": "^3.0.0" } @@ -6062,9 +6062,9 @@ } }, "query-string": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.4.2.tgz", - "integrity": "sha512-DfJqAen17LfLA3rQ+H5S4uXphrF+ANU1lT2ijds4V/Tj4gZxA3gx5/tg1bz7kYCmwna7LyJNCYqO7jNRzo3aLw==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.5.0.tgz", + "integrity": "sha512-TYC4hDjZSvVxLMEucDMySkuAS9UIzSbAiYGyA9GWCjLKB8fQpviFbjd20fD7uejCDxZS+ftSdBKE6DS+xucJFg==", "requires": { "decode-uri-component": "^0.2.0", "split-on-first": "^1.0.0", @@ -6294,9 +6294,9 @@ "integrity": "sha512-pqp9loZbWHW2pVcaAItV5rtEpj6RyPnk0mRlsxRZpbJvrJArJwRMd+WT8BzC+OyTDV1TOdFJCOxDyVNL9I2XTw==" }, "react-native-gesture-handler": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.1.0.tgz", - "integrity": "sha512-E9IKHpmL+sz/iCYkUriTUjBaQBORWV+oheYPQleADkxjo2sYsQfnlyTz4EQYFONkUwJ6WmfTNkYt2/yc5U4Ziw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.2.0.tgz", + "integrity": "sha512-PBsqfyUlzAQQXVEy5nDB8HpehSalhN8Vlc00VJ4RT0FDxlkbpl1otT6DxUN/shMEEuOkyS9gz80ZzWTfAmeBOQ==", "requires": { "hoist-non-react-statics": "^2.3.1", "invariant": "^2.2.2", @@ -6580,11 +6580,12 @@ } }, "react-native-video": { - "version": "github:lbryio/react-native-video#080395677f6ff2acd6273f4b614dd1a1f3714667", + "version": "github:lbryio/react-native-video#0b2ed972f12f8d85d8febaff0b191444fe29cb3f", "from": "github:lbryio/react-native-video#exoplayer-lbry-android", "requires": { - "keymirror": "0.1.1", - "prop-types": "^15.5.10" + "keymirror": "^0.1.1", + "prop-types": "^15.5.10", + "shaka-player": "^2.4.4" } }, "react-navigation": { @@ -7388,6 +7389,11 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" }, + "shaka-player": { + "version": "2.4.7", + "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-2.4.7.tgz", + "integrity": "sha512-KXYVB7snrrmcmDvusf2IIGOXZCvrlb6vXkl1q0pXP/QdUkvHm2SsW6jIXKvDz9xsvs9Pt/R7tm8POgfUOzybcQ==" + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", diff --git a/app/package.json b/app/package.json index c45ac8ef..38d4c091 100644 --- a/app/package.json +++ b/app/package.json @@ -8,8 +8,8 @@ "dependencies": { "base-64": "^0.1.0", "@expo/vector-icons": "^8.1.0", - "lbry-redux": "lbryio/lbry-redux#claim-search-fix", - "lbryinc": "lbryio/lbryinc#sdk-0.36-changes", + "lbry-redux": "lbryio/lbry-redux", + "lbryinc": "lbryio/lbryinc", "lodash": ">=4.17.11", "merge": ">=1.2.1", "moment": "^2.22.1", diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle index 6f739abd..fcde802a 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle @@ -41,6 +41,11 @@ android { } } + compileOptions { + sourceCompatibility 1.8 + targetCompatibility 1.8 + } + dexOptions { jumboMode true }