Merge pull request #43 from zdam-egzamin-zawodowy/upgrade-react-native

update dependencies
This commit is contained in:
Dawid Wysokiński 2021-11-01 16:33:19 +01:00 committed by GitHub
commit 1b673d1333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 1065 additions and 407 deletions

1
.gitignore vendored
View File

@ -29,6 +29,7 @@ release/
.gradle .gradle
local.properties local.properties
*.iml *.iml
*.hprof
# node.js # node.js
# #

View File

@ -122,6 +122,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
*/ */
def enableHermes = project.ext.react.get("enableHermes", false); def enableHermes = project.ext.react.get("enableHermes", false);
/**
* Architectures to build native code for in debug.
*/
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
android { android {
ndkVersion rootProject.ext.ndkVersion ndkVersion rootProject.ext.ndkVersion
@ -166,6 +171,11 @@ android {
buildTypes { buildTypes {
debug { debug {
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
if (nativeArchitectures) {
ndk {
abiFilters nativeArchitectures.split(',')
}
}
} }
release { release {
signingConfig signingConfigs.release signingConfig signingConfigs.release
@ -223,7 +233,7 @@ dependencies {
// Run this once to be able to run the application with BUCK // Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use // puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) { task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile from configurations.implementation
into 'libs' into 'libs'
} }

View File

@ -3,7 +3,6 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="android:textColor">#000000</item>
</style> </style>
<style name="BootTheme" parent="AppTheme"> <style name="BootTheme" parent="AppTheme">

View File

@ -2,20 +2,20 @@
buildscript { buildscript {
ext { ext {
buildToolsVersion = "29.0.3" buildToolsVersion = "30.0.2"
minSdkVersion = 21 minSdkVersion = 21
compileSdkVersion = 29 compileSdkVersion = 30
targetSdkVersion = 29 targetSdkVersion = 30
ndkVersion = "20.1.5948944" ndkVersion = "21.4.7075529"
} }
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:4.1.0") classpath("com.android.tools.build:gradle:4.2.2")
classpath("com.google.gms:google-services:4.3.4") classpath("com.google.gms:google-services:4.3.10")
classpath ("com.google.firebase:firebase-crashlytics-gradle:2.5.1") classpath ("com.google.firebase:firebase-crashlytics-gradle:2.8.0")
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }
@ -23,6 +23,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
mavenCentral()
mavenLocal() mavenLocal()
maven { maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

View File

@ -25,4 +25,4 @@ android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
# Version of flipper SDK to use with React Native # Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.75.1 FLIPPER_VERSION=0.99.0

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -1,7 +1,7 @@
require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
platform :ios, '10.0' platform :ios, '11.0'
target 'ZdamEgzaminZawodowy' do target 'ZdamEgzaminZawodowy' do
config = use_native_modules! config = use_native_modules!
@ -25,5 +25,6 @@ target 'ZdamEgzaminZawodowy' do
post_install do |installer| post_install do |installer|
react_native_post_install(installer) react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end end
end end

View File

@ -1,9 +1,11 @@
{ {
"name": "ZdamEgzaminZawodowy", "name": "zdam-egzamin-zawodowy",
"version": "0.0.1", "version": "2.0.5",
"private": true, "private": true,
"scripts": { "scripts": {
"postinstall": "patch-package",
"android": "react-native run-android", "android": "react-native run-android",
"android:release": "react-native run-android --variant=release",
"ios": "react-native run-ios", "ios": "react-native run-ios",
"start": "react-native start", "start": "react-native start",
"test": "jest", "test": "jest",
@ -16,9 +18,9 @@
"@apollo/client": "^3.3.13", "@apollo/client": "^3.3.13",
"@react-native-async-storage/async-storage": "^1.15.1", "@react-native-async-storage/async-storage": "^1.15.1",
"@react-native-community/masked-view": "^0.1.10", "@react-native-community/masked-view": "^0.1.10",
"@react-native-firebase/analytics": "^12.0.0", "@react-native-firebase/analytics": "^13.0.0",
"@react-native-firebase/app": "^12.0.0", "@react-native-firebase/app": "^13.0.0",
"@react-native-firebase/crashlytics": "^12.0.0", "@react-native-firebase/crashlytics": "^13.0.0",
"@react-native-picker/picker": "^1.14.0", "@react-native-picker/picker": "^1.14.0",
"@react-navigation/native": "^5.9.4", "@react-navigation/native": "^5.9.4",
"@react-navigation/stack": "^5.14.4", "@react-navigation/stack": "^5.14.4",
@ -26,9 +28,11 @@
"graphql": "^15.5.0", "graphql": "^15.5.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"native-base": "^2.15.2", "native-base": "^2.15.2",
"patch-package": "^6.4.7",
"polish-plurals": "^1.1.0", "polish-plurals": "^1.1.0",
"react": "17.0.1", "postinstall-postinstall": "^2.1.0",
"react-native": "0.64.2", "react": "17.0.2",
"react-native": "0.66.1",
"react-native-bootsplash": "^3.2.0", "react-native-bootsplash": "^3.2.0",
"react-native-gesture-handler": "^1.10.3", "react-native-gesture-handler": "^1.10.3",
"react-native-reanimated": "^2.1.0", "react-native-reanimated": "^2.1.0",
@ -48,15 +52,15 @@
"@types/color": "^3.0.1", "@types/color": "^3.0.1",
"@types/jest": "^26.0.20", "@types/jest": "^26.0.20",
"@types/lodash": "^4.14.168", "@types/lodash": "^4.14.168",
"@types/react-native": "^0.64.0", "@types/react-native": "^0.66.1",
"@types/react-test-renderer": "^16.9.2", "@types/react-test-renderer": "^17.0.1",
"babel-jest": "^26.6.3", "babel-jest": "^26.6.3",
"babel-plugin-module-resolver": "^4.1.0", "babel-plugin-module-resolver": "^4.1.0",
"eslint": "^7.14.0", "eslint": "^7.14.0",
"jest": "^26.6.3", "jest": "^26.6.3",
"metro-react-native-babel-preset": "^0.64.0", "metro-react-native-babel-preset": "^0.66.2",
"prettier": "^2.2.1", "prettier": "^2.2.1",
"react-test-renderer": "17.0.1", "react-test-renderer": "17.0.2",
"typescript": "^3.8.3" "typescript": "^3.8.3"
}, },
"resolutions": { "resolutions": {

File diff suppressed because one or more lines are too long

1375
yarn.lock

File diff suppressed because it is too large Load Diff