-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into lindboe/violations/…
…money-request-updates
- Loading branch information
Showing
101 changed files
with
1,004 additions
and
639 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
__mocks__/@react-navigation/native/index.js → __mocks__/@react-navigation/native/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle b/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle | ||
| index 3f76132..63dc946 100644 | ||
| --- a/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle | ||
| +++ b/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle | ||
| @@ -81,7 +81,9 @@ def findNodeModulePath(baseDir, packageName) { | ||
| } | ||
|
|
||
| def resolveReactNativeDirectory() { | ||
| - def reactNative = file("${findNodeModulePath(rootProject.projectDir, "react-native")}") | ||
| + def projectDir = this.hasProperty('reactNativeProject') ? this.reactNativeProject : rootProject.projectDir | ||
| + def modulePath = file(projectDir); | ||
| + def reactNative = file("${findNodeModulePath(modulePath, 'react-native')}") | ||
| if (reactNative.exists()) { | ||
| return reactNative | ||
| } |
52 changes: 52 additions & 0 deletions
52
patches/@react-native-community+cli-platform-android+12.3.0.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| diff --git a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle | ||
| index bbfa7f7..ed53872 100644 | ||
| --- a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle | ||
| +++ b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle | ||
| @@ -140,6 +140,7 @@ class ReactNativeModules { | ||
| private Logger logger | ||
| private String packageName | ||
| private File root | ||
| + private File rnRoot | ||
| private ArrayList<HashMap<String, String>> reactNativeModules | ||
| private ArrayList<String> unstable_reactLegacyComponentNames | ||
| private HashMap<String, ArrayList> reactNativeModulesBuildVariants | ||
| @@ -147,9 +148,10 @@ class ReactNativeModules { | ||
|
|
||
| private static String LOG_PREFIX = ":ReactNative:" | ||
|
|
||
| - ReactNativeModules(Logger logger, File root) { | ||
| + ReactNativeModules(Logger logger, File root, File rnRoot) { | ||
| this.logger = logger | ||
| this.root = root | ||
| + this.rnRoot = rnRoot | ||
|
|
||
| def (nativeModules, reactNativeModulesBuildVariants, androidProject, reactNativeVersion) = this.getReactNativeConfig() | ||
| this.reactNativeModules = nativeModules | ||
| @@ -416,10 +418,10 @@ class ReactNativeModules { | ||
| */ | ||
| def cliResolveScript = "try {console.log(require('@react-native-community/cli').bin);} catch (e) {console.log(require('react-native/cli').bin);}" | ||
| String[] nodeCommand = ["node", "-e", cliResolveScript] | ||
| - def cliPath = this.getCommandOutput(nodeCommand, this.root) | ||
| + def cliPath = this.getCommandOutput(nodeCommand, this.rnRoot) | ||
|
|
||
| String[] reactNativeConfigCommand = ["node", cliPath, "config"] | ||
| - def reactNativeConfigOutput = this.getCommandOutput(reactNativeConfigCommand, this.root) | ||
| + def reactNativeConfigOutput = this.getCommandOutput(reactNativeConfigCommand, this.rnRoot) | ||
|
|
||
| def json | ||
| try { | ||
| @@ -486,7 +488,13 @@ class ReactNativeModules { | ||
| */ | ||
| def projectRoot = rootProject.projectDir | ||
|
|
||
| -def autoModules = new ReactNativeModules(logger, projectRoot) | ||
| +def autoModules | ||
| + | ||
| +if(this.hasProperty('reactNativeProject')){ | ||
| + autoModules = new ReactNativeModules(logger, projectRoot, new File(projectRoot, reactNativeProject)) | ||
| +} else { | ||
| + autoModules = new ReactNativeModules(logger, projectRoot, projectRoot) | ||
| +} | ||
|
|
||
| def reactNativeVersionRequireNewArchEnabled(autoModules) { | ||
| def rnVersion = autoModules.reactNativeVersion |
52 changes: 52 additions & 0 deletions
52
patches/@react-native-community+cli-platform-ios+12.3.0.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| diff --git a/node_modules/@react-native-community/cli-platform-ios/native_modules.rb b/node_modules/@react-native-community/cli-platform-ios/native_modules.rb | ||
| index 82f537c..f5e2cda 100644 | ||
| --- a/node_modules/@react-native-community/cli-platform-ios/native_modules.rb | ||
| +++ b/node_modules/@react-native-community/cli-platform-ios/native_modules.rb | ||
| @@ -12,7 +12,7 @@ | ||
| require 'pathname' | ||
| require 'cocoapods' | ||
|
|
||
| -def use_native_modules!(config = nil) | ||
| +def updateConfig(config = nil) | ||
| if (config.is_a? String) | ||
| Pod::UI.warn("Passing custom root to use_native_modules! is deprecated.", | ||
| [ | ||
| @@ -24,7 +24,6 @@ def use_native_modules!(config = nil) | ||
| # Resolving the path the RN CLI. The `@react-native-community/cli` module may not be there for certain package managers, so we fall back to resolving it through `react-native` package, that's always present in RN projects | ||
| cli_resolve_script = "try {console.log(require('@react-native-community/cli').bin);} catch (e) {console.log(require('react-native/cli').bin);}" | ||
| cli_bin = Pod::Executable.execute_command("node", ["-e", cli_resolve_script], true).strip | ||
| - | ||
| if (!config) | ||
| json = [] | ||
|
|
||
| @@ -36,10 +35,30 @@ def use_native_modules!(config = nil) | ||
|
|
||
| config = JSON.parse(json.join("\n")) | ||
| end | ||
| +end | ||
| + | ||
| +def use_native_modules!(config = nil) | ||
| + if (ENV['REACT_NATIVE_DIR']) | ||
| + Dir.chdir(ENV['REACT_NATIVE_DIR']) do | ||
| + config = updateConfig(config) | ||
| + end | ||
| + else | ||
| + config = updateConfig(config) | ||
| + end | ||
|
|
||
| project_root = Pathname.new(config["project"]["ios"]["sourceDir"]) | ||
|
|
||
| + if(ENV["PROJECT_ROOT_DIR"]) | ||
| + project_root = File.join(Dir.pwd, ENV["PROJECT_ROOT_DIR"]) | ||
| + | ||
| + end | ||
| + | ||
| packages = config["dependencies"] | ||
| + | ||
| + if (ENV["NO_FLIPPER"]) | ||
| + packages = {**packages, "react-native-flipper" => {"platforms" => {"ios" => nil}}} | ||
| + end | ||
| + | ||
| found_pods = [] | ||
|
|
||
| packages.each do |package_name, package| |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| diff --git a/node_modules/@react-native-firebase/analytics/android/build.gradle b/node_modules/@react-native-firebase/analytics/android/build.gradle | ||
| index d223ebf..821b730 100644 | ||
| --- a/node_modules/@react-native-firebase/analytics/android/build.gradle | ||
| +++ b/node_modules/@react-native-firebase/analytics/android/build.gradle | ||
| @@ -45,6 +45,8 @@ if (coreVersionDetected != coreVersionRequired) { | ||
| } | ||
| } | ||
|
|
||
| +apply plugin: 'com.android.library' | ||
| + | ||
| project.ext { | ||
| set('react-native', [ | ||
| versions: [ | ||
| @@ -144,4 +146,3 @@ dependencies { | ||
| ReactNative.shared.applyPackageVersion() | ||
| ReactNative.shared.applyDefaultExcludes() | ||
| ReactNative.module.applyAndroidVersions() | ||
| -ReactNative.module.applyReactNativeDependency("api") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| diff --git a/node_modules/@react-native-firebase/app/android/build.gradle b/node_modules/@react-native-firebase/app/android/build.gradle | ||
| index 05f629a..7c36693 100644 | ||
| --- a/node_modules/@react-native-firebase/app/android/build.gradle | ||
| +++ b/node_modules/@react-native-firebase/app/android/build.gradle | ||
| @@ -18,6 +18,7 @@ buildscript { | ||
|
|
||
| plugins { | ||
| id "io.invertase.gradle.build" version "1.5" | ||
| + id 'com.android.library' | ||
| } | ||
|
|
||
| def packageJson = PackageJson.getForProject(project) | ||
| @@ -91,6 +92,7 @@ repositories { | ||
| } | ||
|
|
||
| dependencies { | ||
| + api 'com.facebook.react:react-native:+' | ||
| implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}") | ||
| implementation "com.google.firebase:firebase-common" | ||
| implementation "com.google.android.gms:play-services-auth:${ReactNative.ext.getVersion("play", "play-services-auth")}" | ||
| @@ -99,4 +101,3 @@ dependencies { | ||
| ReactNative.shared.applyPackageVersion() | ||
| ReactNative.shared.applyDefaultExcludes() | ||
| ReactNative.module.applyAndroidVersions() | ||
| -ReactNative.module.applyReactNativeDependency("api") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| diff --git a/node_modules/@react-native-firebase/crashlytics/android/build.gradle b/node_modules/@react-native-firebase/crashlytics/android/build.gradle | ||
| index 6b6de57..9b89ae7 100644 | ||
| --- a/node_modules/@react-native-firebase/crashlytics/android/build.gradle | ||
| +++ b/node_modules/@react-native-firebase/crashlytics/android/build.gradle | ||
| @@ -18,6 +18,7 @@ buildscript { | ||
|
|
||
| plugins { | ||
| id "io.invertase.gradle.build" version "1.5" | ||
| + id 'com.android.library' | ||
| } | ||
|
|
||
| def appProject | ||
| @@ -92,4 +93,3 @@ dependencies { | ||
| ReactNative.shared.applyPackageVersion() | ||
| ReactNative.shared.applyDefaultExcludes() | ||
| ReactNative.module.applyAndroidVersions() | ||
| -ReactNative.module.applyReactNativeDependency("api") |
Oops, something went wrong.