Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Bump react-native version to fix build failures #1040

Merged
merged 17 commits into from
Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ buck-out/
# Translation files
/translations

# Intl polyfills (generated via /scripts/build-intl-polyfill.js
/src/frontend/polyfills/intl-relativetimeformat.ts

# Private env variables
.env
.bitrise.secrets.yml
Expand Down
7 changes: 1 addition & 6 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def enableProguardInReleaseBuilds = false
* give correct results when using with locales other than en-US. Note that
* this variant is about 6MiB larger per architecture than default.
*/
def jscFlavor = 'org.webkit:android-jsc:+'
def jscFlavor = 'org.webkit:android-jsc-intl:+'

/**
* Whether to enable the Hermes VM.
Expand Down Expand Up @@ -349,9 +349,6 @@ android {
exclude 'META-INF/LICENSE'
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
// Make sure libjsc.so does not packed in APK
// This is for react-native-v8
exclude "**/libjsc.so"
}

// Use Java 1.8
Expand All @@ -365,8 +362,6 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules
// Add v8-android - prebuilt libv8.so into APK
implementation 'org.chromium:v8-android:9.93.+'

addUnimodulesDependencies()

Expand Down
8 changes: 4 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ allprojects {
mavenLocal()
maven { url("https://maven.google.com") }
maven {
// Replace AAR from original RN with AAR from react-native-v8
url("$rootDir/../node_modules/react-native-v8/dist")
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url("$rootDir/../node_modules/react-native/android")
}
maven {
// prebuilt libv8.so
url("$rootDir/../node_modules/v8-android/dist")
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
maven {
// expo-camera bundles a custom com.google.android:cameraview
Expand Down
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// @flow
// setup bugsnag before anything else
import "./src/frontend/lib/logger";
import "./src/frontend/polyfills";

import { AppRegistry } from "react-native";
import App from "./src/frontend/App";
import { name as appName } from "./app.json";
Expand Down
Loading