Skip to content
This repository has been archived by the owner on Sep 25, 2022. It is now read-only.

Commit

Permalink
Merge pull request #43 from zdam-egzamin-zawodowy/upgrade-react-native
Browse files Browse the repository at this point in the history
update dependencies
  • Loading branch information
Kichiyaki authored Nov 1, 2021
2 parents b7cfa66 + 806db83 commit 1b673d1
Show file tree
Hide file tree
Showing 10 changed files with 1,067 additions and 409 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ release/
.gradle
local.properties
*.iml
*.hprof

# node.js
#
Expand Down
12 changes: 11 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
*/
def enableHermes = project.ext.react.get("enableHermes", false);

/**
* Architectures to build native code for in debug.
*/
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")

android {
ndkVersion rootProject.ext.ndkVersion

Expand Down Expand Up @@ -166,6 +171,11 @@ android {
buildTypes {
debug {
signingConfig signingConfigs.debug
if (nativeArchitectures) {
ndk {
abiFilters nativeArchitectures.split(',')
}
}
}
release {
signingConfig signingConfigs.release
Expand Down Expand Up @@ -223,7 +233,7 @@ dependencies {
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
from configurations.implementation
into 'libs'
}

Expand Down
1 change: 0 additions & 1 deletion android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:textColor">#000000</item>
</style>

<style name="BootTheme" parent="AppTheme">
Expand Down
17 changes: 9 additions & 8 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,28 @@

buildscript {
ext {
buildToolsVersion = "29.0.3"
buildToolsVersion = "30.0.2"
minSdkVersion = 21
compileSdkVersion = 29
targetSdkVersion = 29
ndkVersion = "20.1.5948944"
compileSdkVersion = 30
targetSdkVersion = 30
ndkVersion = "21.4.7075529"
}
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:4.1.0")
classpath("com.google.gms:google-services:4.3.4")
classpath ("com.google.firebase:firebase-crashlytics-gradle:2.5.1")
classpath("com.android.tools.build:gradle:4.2.2")
classpath("com.google.gms:google-services:4.3.10")
classpath ("com.google.firebase:firebase-crashlytics-gradle:2.8.0")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
repositories {
mavenCentral()
mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ android.useAndroidX=true
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.75.1
FLIPPER_VERSION=0.99.0
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists
5 changes: 3 additions & 2 deletions ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

platform :ios, '10.0'
platform :ios, '11.0'

target 'ZdamEgzaminZawodowy' do
config = use_native_modules!
Expand All @@ -25,5 +25,6 @@ target 'ZdamEgzaminZawodowy' do

post_install do |installer|
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
end
end
26 changes: 15 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"name": "ZdamEgzaminZawodowy",
"version": "0.0.1",
"name": "zdam-egzamin-zawodowy",
"version": "2.0.5",
"private": true,
"scripts": {
"postinstall": "patch-package",
"android": "react-native run-android",
"android:release": "react-native run-android --variant=release",
"ios": "react-native run-ios",
"start": "react-native start",
"test": "jest",
Expand All @@ -16,19 +18,21 @@
"@apollo/client": "^3.3.13",
"@react-native-async-storage/async-storage": "^1.15.1",
"@react-native-community/masked-view": "^0.1.10",
"@react-native-firebase/analytics": "^12.0.0",
"@react-native-firebase/app": "^12.0.0",
"@react-native-firebase/crashlytics": "^12.0.0",
"@react-native-firebase/analytics": "^13.0.0",
"@react-native-firebase/app": "^13.0.0",
"@react-native-firebase/crashlytics": "^13.0.0",
"@react-native-picker/picker": "^1.14.0",
"@react-navigation/native": "^5.9.4",
"@react-navigation/stack": "^5.14.4",
"date-fns": "^2.19.0",
"graphql": "^15.5.0",
"lodash": "^4.17.21",
"native-base": "^2.15.2",
"patch-package": "^6.4.7",
"polish-plurals": "^1.1.0",
"react": "17.0.1",
"react-native": "0.64.2",
"postinstall-postinstall": "^2.1.0",
"react": "17.0.2",
"react-native": "0.66.1",
"react-native-bootsplash": "^3.2.0",
"react-native-gesture-handler": "^1.10.3",
"react-native-reanimated": "^2.1.0",
Expand All @@ -48,15 +52,15 @@
"@types/color": "^3.0.1",
"@types/jest": "^26.0.20",
"@types/lodash": "^4.14.168",
"@types/react-native": "^0.64.0",
"@types/react-test-renderer": "^16.9.2",
"@types/react-native": "^0.66.1",
"@types/react-test-renderer": "^17.0.1",
"babel-jest": "^26.6.3",
"babel-plugin-module-resolver": "^4.1.0",
"eslint": "^7.14.0",
"jest": "^26.6.3",
"metro-react-native-babel-preset": "^0.64.0",
"metro-react-native-babel-preset": "^0.66.2",
"prettier": "^2.2.1",
"react-test-renderer": "17.0.1",
"react-test-renderer": "17.0.2",
"typescript": "^3.8.3"
},
"resolutions": {
Expand Down
31 changes: 31 additions & 0 deletions patches/native-base+2.15.2.patch

Large diffs are not rendered by default.

Loading

0 comments on commit 1b673d1

Please sign in to comment.