From c4021749b1970d7980e6b5935978218677026d19 Mon Sep 17 00:00:00 2001 From: Abhi Kulshrestha <40908684+AbhiKul10@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:53:53 +0530 Subject: [PATCH 1/3] Upgraded Library versions 1) Upgraded buildToolsversion to minimum require for running 2) Added arm64-v8a, as to run the project on android emulator(Apple Macbook Pro M1 chip) 3) Updated classpath to higher version 4) Upgraded react-navigation, react-navigation-stack, react-native-gesture-handler to higher Versions. --- android/app/build.gradle | 6 +++--- android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- package.json | 8 ++++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ad62149..83fdd58 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -96,7 +96,7 @@ def enableProguardInReleaseBuilds = false android { compileSdkVersion 28 - buildToolsVersion "27.0.3" + buildToolsVersion "29.0.2" defaultConfig { applicationId "com.go_social" @@ -105,7 +105,7 @@ android { versionCode 1 versionName "1.0" ndk { - abiFilters "armeabi-v7a", "x86" + abiFilters "armeabi-v7a", "arm64-v8a", "x86" } } splits { @@ -113,7 +113,7 @@ android { reset() enable enableSeparateBuildPerCPUArchitecture universalApk false // If true, also generate a universal APK - include "armeabi-v7a", "x86" + include "armeabi-v7a", "arm64-v8a", "x86" } } buildTypes { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 01d49c7..c7cdbc7 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Tue Apr 06 13:26:18 IST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -# distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/package.json b/package.json index e9a836f..9112214 100644 --- a/package.json +++ b/package.json @@ -13,15 +13,19 @@ "react-native": "^0.58.6", "react-native-elements": "^1.1.0", "react-native-fbsdk": "1.0.0-rc.3", - "react-native-gesture-handler": "^1.0.12", + "react-native-gesture-handler": "^1.10.3", "react-native-google-places-autocomplete": "^1.3.9", "react-native-image-crop-picker": "^0.28.0", "react-native-image-picker": "^2.0.0", "react-native-maps": "^0.26.1", "react-native-maps-directions": "^1.6.0", "react-native-micro-animated-button": "0.0.28", + "react-native-reanimated": "^2.1.0", + "react-native-safe-area-context": "^3.2.0", + "react-native-screens": "^3.0.0", "react-native-vector-icons": "^6.1.0", - "react-navigation": "^4.0.6" + "react-navigation": "^4.4.4", + "react-navigation-stack": "^2.10.4" }, "devDependencies": { "babel-jest": "25.1.0", From ff60371fd7a2c5560f8d344ac80d0207fabd2c8a Mon Sep 17 00:00:00 2001 From: Abhi Kulshrestha <40908684+AbhiKul10@users.noreply.github.com> Date: Fri, 9 Apr 2021 19:11:27 +0530 Subject: [PATCH 2/3] installing react-navigation-stack library Installing react-navigation-stack library as all navigators have been moved to separate repos, and updating package.json file. --- App.js | 10 ++++++++-- package.json | 7 ++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/App.js b/App.js index 79a0bb3..e638c41 100644 --- a/App.js +++ b/App.js @@ -1,8 +1,14 @@ import React, { Component } from "react"; import { AppRegistry, Dimensions, ActivityIndicator, AsyncStorage, View, StyleSheet, StatusBar } from "react-native"; -import { createStackNavigator, createSwitchNavigator, createBottomTabNavigator, createAppContainer } from "react-navigation"; + + +import { createSwitchNavigator, createAppContainer } from "react-navigation"; +import { createBottomTabNavigator } from "@react-navigation/bottom-tabs" +import { createStackNavigator } from 'react-navigation-stack'; import Ionicons from "react-native-vector-icons/FontAwesome"; + + //Components import HomeScreen from "./app/screens/HomeScreen/homeScreen"; import MapScreen from "./app/screens/MapScreen/mapScreen"; @@ -115,4 +121,4 @@ const AuthStack = createStackNavigator( const AppContainer = createAppContainer(AuthStack); export default AppContainer; - + diff --git a/package.json b/package.json index 9112214..f75dfc3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,11 @@ "test": "jest --detectOpenHandles -u" }, "dependencies": { + "@react-native-async-storage/async-storage": "^1.15.1", + "@react-native-community/async-storage": "^1.12.1", + "@react-navigation/bottom-tabs": "^5.11.9", "email-validator": "^2.0.4", + "es6-symbol": "^3.1.3", "firebase": "^7.2.2", "react": "16.12.0", "react-native": "^0.58.6", @@ -25,7 +29,8 @@ "react-native-screens": "^3.0.0", "react-native-vector-icons": "^6.1.0", "react-navigation": "^4.4.4", - "react-navigation-stack": "^2.10.4" + "react-navigation-stack": "^2.10.4", + "string.fromcodepoint": "^1.0.0" }, "devDependencies": { "babel-jest": "25.1.0", From 04c5656f64d395645733016a6632b0adb216d118 Mon Sep 17 00:00:00 2001 From: Abhi Kulshrestha <40908684+AbhiKul10@users.noreply.github.com> Date: Fri, 4 Jun 2021 22:06:14 +0530 Subject: [PATCH 3/3] Update build.gradle --- android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 83fdd58..80547e8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -96,7 +96,7 @@ def enableProguardInReleaseBuilds = false android { compileSdkVersion 28 - buildToolsVersion "29.0.2" + buildToolsVersion "27.0.3" defaultConfig { applicationId "com.go_social"