From 14abe4d2aceadb152fbfc8d3e46b05341d565ea9 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 4 May 2022 17:26:32 -0400 Subject: [PATCH] Remove jcenter (#6226) --- android/build.gradle | 2 -- ios/Podfile.lock | 8 ++--- package-lock.json | 32 +++++++++--------- package.json | 4 +-- patches/@nozbe+watermelondb+0.24.0.patch | 23 ++++++++++++- .../@react-native-community+art+1.2.0.patch | 33 +++++++++++++++++++ patches/react-native-youtube+2.0.2.patch | 19 +++++++++-- 7 files changed, 94 insertions(+), 27 deletions(-) create mode 100644 patches/@react-native-community+art+1.2.0.patch diff --git a/android/build.gradle b/android/build.gradle index a41f814e67..31c1f5a20e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,7 +16,6 @@ buildscript { repositories { mavenCentral() mavenLocal() - jcenter() google() } dependencies { @@ -36,7 +35,6 @@ allprojects { google() mavenCentral() mavenLocal() - jcenter() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url("$rootDir/../node_modules/react-native/android") diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 8c0cc09875..7394ade679 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -337,7 +337,7 @@ PODS: - React-Core - react-native-document-picker (8.1.0): - React-Core - - react-native-emm (1.2.1): + - react-native-emm (1.2.2): - React-Core - react-native-hw-keyboard-event (0.0.4): - React @@ -352,7 +352,7 @@ PODS: - SwiftyJSON (~> 5.0) - react-native-notifications (4.2.4): - React-Core - - react-native-paste-input (0.4.0): + - react-native-paste-input (0.4.1): - React-Core - Swime (= 3.0.6) - react-native-safe-area-context (4.2.4): @@ -901,13 +901,13 @@ SPEC CHECKSUMS: react-native-cookies: 7e14e823f32bd7c868134c7e207c89a46fa28f98 react-native-create-thumbnail: dedcb7cd3d14a4b6cc2026563197242081edb52b react-native-document-picker: 5663fe4bcdb646200683a41790464d2793307ac8 - react-native-emm: 3dec2bc8e93eff704f52db3bfbd6ec2adfd49b0f + react-native-emm: 47bb1ba2bcebec7ec62daa250eb2c6eaab38b5af react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53 react-native-image-picker: 4e6008ad8c2321622affa2c85432a5ebd02d480c react-native-netinfo: e922cb2e3eaf9ccdf16b8d4744a89657377aa4a1 react-native-network-client: 30ab97e7e6c8d6f2d2b10cc1ebad0cbf9c894c6e react-native-notifications: 3de8ef9cd800e5db0225d9aa46b228d2b94ce51e - react-native-paste-input: fcfb6fd35df51c3d3f58e80ca3baf4ffe0c3e4fa + react-native-paste-input: 8cfa163057b4d1406c39e3d3531f446c49c8df9b react-native-safe-area-context: f98b0b16d1546d208fc293b4661e3f81a895afd9 react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28 react-native-webview: 0b7bd2bffced115aefd393e1841babd9b9a557b1 diff --git a/package-lock.json b/package-lock.json index a64b2e1b0f..1edd7d4b63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ "@formatjs/intl-pluralrules": "4.3.3", "@formatjs/intl-relativetimeformat": "10.0.1", "@mattermost/compass-icons": "0.1.22", - "@mattermost/react-native-emm": "1.2.1", + "@mattermost/react-native-emm": "1.2.2", "@mattermost/react-native-network-client": "github:mattermost/react-native-network-client", - "@mattermost/react-native-paste-input": "0.4.0", + "@mattermost/react-native-paste-input": "0.4.1", "@nozbe/watermelondb": "0.24.0", "@nozbe/with-observables": "1.4.0", "@react-native-community/art": "1.2.0", @@ -3066,9 +3066,9 @@ } }, "node_modules/@mattermost/react-native-emm": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mattermost/react-native-emm/-/react-native-emm-1.2.1.tgz", - "integrity": "sha512-K8hg0PcfpZfI1YVxNXJ4uBSnYp6W+eXTFxhZ3itacbH7d5twlt11uHZCSei7BiSRszraKeg4A2UaAgiXIymzpw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@mattermost/react-native-emm/-/react-native-emm-1.2.2.tgz", + "integrity": "sha512-ibSBh+dw0E/4LgY8DZDu9hGZmvGT1k/3A7qQu12jQACxf9eAWg1JBT4mIV/iM+f33VcM4Rs9zZo3473DX3DFuw==", "peerDependencies": { "react": "*", "react-native": "*" @@ -3076,7 +3076,7 @@ }, "node_modules/@mattermost/react-native-network-client": { "version": "0.1.0", - "resolved": "git+ssh://git@github.com/mattermost/react-native-network-client.git#bdf19c9de9662dcedb5d0b1884ed84661c17a8e7", + "resolved": "git+ssh://git@github.com/mattermost/react-native-network-client.git#aaf88d2142e8b5c3b89b17aa19605232c490b763", "license": "MIT", "dependencies": { "validator": "13.7.0", @@ -3088,9 +3088,9 @@ } }, "node_modules/@mattermost/react-native-paste-input": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mattermost/react-native-paste-input/-/react-native-paste-input-0.4.0.tgz", - "integrity": "sha512-LPW2rCCNk5BBfZQQLAwV2brfOy+iiWMV5VYy9jMWA7Ad7U94+8Kb1UiUTTrPV7oXiU+mds//mMTm+AEcjbcdbg==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@mattermost/react-native-paste-input/-/react-native-paste-input-0.4.1.tgz", + "integrity": "sha512-Ez5q/ywzpBnirAvAOO+n0ZJ8P4hfnWZVyPtrfFz24XhnHAFMbrC0ZZk9JlfRtN4wfDwJQMhOkrbuBdpw0CjCNw==", "dependencies": { "deprecated-react-native-prop-types": "^2.3.0" }, @@ -25732,13 +25732,13 @@ } }, "@mattermost/react-native-emm": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@mattermost/react-native-emm/-/react-native-emm-1.2.1.tgz", - "integrity": "sha512-K8hg0PcfpZfI1YVxNXJ4uBSnYp6W+eXTFxhZ3itacbH7d5twlt11uHZCSei7BiSRszraKeg4A2UaAgiXIymzpw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@mattermost/react-native-emm/-/react-native-emm-1.2.2.tgz", + "integrity": "sha512-ibSBh+dw0E/4LgY8DZDu9hGZmvGT1k/3A7qQu12jQACxf9eAWg1JBT4mIV/iM+f33VcM4Rs9zZo3473DX3DFuw==", "requires": {} }, "@mattermost/react-native-network-client": { - "version": "git+ssh://git@github.com/mattermost/react-native-network-client.git#bdf19c9de9662dcedb5d0b1884ed84661c17a8e7", + "version": "git+ssh://git@github.com/mattermost/react-native-network-client.git#aaf88d2142e8b5c3b89b17aa19605232c490b763", "from": "@mattermost/react-native-network-client@github:mattermost/react-native-network-client", "requires": { "validator": "13.7.0", @@ -25746,9 +25746,9 @@ } }, "@mattermost/react-native-paste-input": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@mattermost/react-native-paste-input/-/react-native-paste-input-0.4.0.tgz", - "integrity": "sha512-LPW2rCCNk5BBfZQQLAwV2brfOy+iiWMV5VYy9jMWA7Ad7U94+8Kb1UiUTTrPV7oXiU+mds//mMTm+AEcjbcdbg==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@mattermost/react-native-paste-input/-/react-native-paste-input-0.4.1.tgz", + "integrity": "sha512-Ez5q/ywzpBnirAvAOO+n0ZJ8P4hfnWZVyPtrfFz24XhnHAFMbrC0ZZk9JlfRtN4wfDwJQMhOkrbuBdpw0CjCNw==", "requires": { "deprecated-react-native-prop-types": "^2.3.0" } diff --git a/package.json b/package.json index dfeb1f0275..af2289d6bb 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "@formatjs/intl-pluralrules": "4.3.3", "@formatjs/intl-relativetimeformat": "10.0.1", "@mattermost/compass-icons": "0.1.22", - "@mattermost/react-native-emm": "1.2.1", + "@mattermost/react-native-emm": "1.2.2", "@mattermost/react-native-network-client": "github:mattermost/react-native-network-client", - "@mattermost/react-native-paste-input": "0.4.0", + "@mattermost/react-native-paste-input": "0.4.1", "@nozbe/watermelondb": "0.24.0", "@nozbe/with-observables": "1.4.0", "@react-native-community/art": "1.2.0", diff --git a/patches/@nozbe+watermelondb+0.24.0.patch b/patches/@nozbe+watermelondb+0.24.0.patch index 9f0f9a3123..57bce6052f 100644 --- a/patches/@nozbe+watermelondb+0.24.0.patch +++ b/patches/@nozbe+watermelondb+0.24.0.patch @@ -27,7 +27,7 @@ index 1a7c99e..0cb7b87 100644 public markAsDeleted(): Promise diff --git a/node_modules/@nozbe/watermelondb/Model/index.js b/node_modules/@nozbe/watermelondb/Model/index.js -index 075a047..5af3995 100644 +index 075a047..75e5936 100644 --- a/node_modules/@nozbe/watermelondb/Model/index.js +++ b/node_modules/@nozbe/watermelondb/Model/index.js @@ -78,6 +78,18 @@ var Model = /*#__PURE__*/function () { @@ -73,6 +73,27 @@ index 1f3af50..e9fea58 100644 s.requires_arc = true # simdjson is annoyingly slow without compiler optimization, disable for debugging s.compiler_flags = '-Os' +diff --git a/node_modules/@nozbe/watermelondb/native/android/build.gradle b/node_modules/@nozbe/watermelondb/native/android/build.gradle +index 90ddf7a..e5ec9ec 100644 +--- a/node_modules/@nozbe/watermelondb/native/android/build.gradle ++++ b/node_modules/@nozbe/watermelondb/native/android/build.gradle +@@ -9,7 +9,8 @@ buildscript { + } + + repositories { +- jcenter() ++ mavenCentral() ++ mavenLocal() + } + + dependencies { +@@ -40,5 +41,6 @@ dependencies { + + repositories { + mavenCentral() ++ mavenLocal() + } + diff --git a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt index ca31e20..b45c753 100644 --- a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt diff --git a/patches/@react-native-community+art+1.2.0.patch b/patches/@react-native-community+art+1.2.0.patch new file mode 100644 index 0000000000..05370efa33 --- /dev/null +++ b/patches/@react-native-community+art+1.2.0.patch @@ -0,0 +1,33 @@ +diff --git a/node_modules/@react-native-community/art/android/build.gradle b/node_modules/@react-native-community/art/android/build.gradle +index 949bc00..ffeb4ff 100644 +--- a/node_modules/@react-native-community/art/android/build.gradle ++++ b/node_modules/@react-native-community/art/android/build.gradle +@@ -3,10 +3,6 @@ buildscript { + google() + jcenter() + } +- +- dependencies { +- classpath 'com.android.tools.build:gradle:3.2.1' +- } + } + + def getExtOrDefault(name) { +@@ -31,15 +27,15 @@ android { + + repositories { + google() +- jcenter() + mavenCentral() ++ mavenLocal() + } + + allprojects { + repositories { ++ mavenCentral() + mavenLocal() + google() +- jcenter() + maven { + url "$rootDir/../node_modules/react-native/android" + } diff --git a/patches/react-native-youtube+2.0.2.patch b/patches/react-native-youtube+2.0.2.patch index 3f9c7fd9e9..8c0d8752ac 100644 --- a/patches/react-native-youtube+2.0.2.patch +++ b/patches/react-native-youtube+2.0.2.patch @@ -72,11 +72,26 @@ index 0ee59c6..4a8294b 100644 ? null - : { playVideo: (videoId) => YouTubeStandalone.playVideo(videoId) }; + : { playVideo: (videoId, startTime) => YouTubeStandalone.playVideo(videoId, startTime) }; +diff --git a/node_modules/react-native-youtube/android/build.gradle b/node_modules/react-native-youtube/android/build.gradle +index 0417bc6..6249f65 100755 +--- a/node_modules/react-native-youtube/android/build.gradle ++++ b/node_modules/react-native-youtube/android/build.gradle +@@ -6,8 +6,9 @@ def safeExtGet(prop, fallback) { + + buildscript { + repositories { ++ mavenCentral() ++ mavenLocal() + google() +- jcenter() + } + + dependencies { diff --git a/node_modules/react-native-youtube/main.d.ts b/node_modules/react-native-youtube/main.d.ts -index d771db7..410709d 100644 +index 80c7df5..849104b 100644 --- a/node_modules/react-native-youtube/main.d.ts +++ b/node_modules/react-native-youtube/main.d.ts -@@ -35,7 +35,7 @@ declare class YouTube extends React.Component { +@@ -36,7 +36,7 @@ declare class YouTube extends React.Component { } export declare const YouTubeStandaloneIOS: {