Update R - 17.0.1, RN - 0.64.1, RNN - 7.14.0 (#59)

* trying * iOS build fix * iOS Build Fixed * Android build working * Fix `registerComponentWithRedux` deprecation * fix lint, bump version * fix travis * Move Flipper to Debug folder * remove unnecessary files * Add Side Menu, Update Readme * Fix Lint, Update readme * trying * iOS build fix * iOS Build Fixed * Android build working * Fix `registerComponentWithRedux` deprecation * fix lint, bump version * fix travis * Move Flipper to Debug folder * remove unnecessary files * Add Side Menu, Update Readme * Fix Lint, Update readme * update table of content * Add thunk sample, push example, cleanup * Update Readme * fix lint issues * Update Images * update readme * Added 'usesCleartextTraffic' to androidmanifeast * Update RN, RNN
AmitM30 · May 20, 2021 · 5f36c52 · 5f36c52
1 parent b79f275
commit 5f36c52
Show file tree

Hide file tree

Showing 19 changed files with 3,191 additions and 3,803 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,6 @@
 *.pbxproj -text
+
+
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  bracketSpacing: false,
+  jsxBracketSameLine: true,
+  singleQuote: true,
+  trailingComma: 'all',
+  arrowParens: 'avoid',
+};
diff --git a/README.md b/README.md
@@ -12,10 +12,11 @@ ___
 
 | Updates | RNN | RN | React | Comments |
 |---|---|---|---|---|
-|  07 Oct '20 | 7.1.0 | 0.63.3 | 16.13.1 | Support for Flipper
-|  27 Apr '20 | 3.7.0 | 0.61.5 | 16.9.0 | Support for RN > 0.60, Android X
-|  02 Nov '19 | 2.26.2 | 0.59.10 |  | Maintenance |
-|  08 Mar '19 | 2.13.1 | 0.58.6 | 16.8.4 |
+|  May '21 | 7.14.0 | 0.64.1 | 17.0.1 | Update RN RNN, Hermes Support
+|  Oct '20 | 7.1.0 | 0.63.3 | 16.13.1 | Support for Flipper
+|  Apr '20 | 3.7.0 | 0.61.5 | 16.9.0 | Support for RN > 0.60, Android X
+|  Nov '19 | 2.26.2 | 0.59.10 |  | Maintenance |
+|  Mar '19 | 2.13.1 | 0.58.6 | 16.8.4 |
 
 ## Introduction
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -78,7 +78,7 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "index.js",
+    // entryFile: "index.js",
     enableHermes: false,  // clean and rebuild if changing
     // hermesCommand: "../../node_modules/hermes-engine/%OS-BIN%/hermes"
     bundleInDebug: true
@@ -124,6 +124,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 android {
+    ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
@@ -133,7 +134,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative57"
+        // sourceCompatibility "RNN.reactNativeVersion", "reactNative57"
         ndk {
             abiFilters "armeabi-v7a", "x86", 'armeabi', 'arm64-v8a'
         }
@@ -184,15 +185,17 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     // implementation project(':react-native-navigation')
-    //noinspection GradleDynamicVersion
+    // noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    compile 'com.android.support:multidex:1.0.0'
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.fbjni'
     }
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
     }
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
+</manifest>
diff --git a/android/app/src/debug/java/com/fridayapp/ReactNativeFlipper.java b/android/app/src/debug/java/com/fridayapp/ReactNativeFlipper.java
@@ -5,6 +5,7 @@
  * directory of this source tree.
  */
 package com.rndiffapp;
+
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.android.utils.FlipperUtils;
@@ -22,15 +23,18 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
 import okhttp3.OkHttpClient;
+
 public class ReactNativeFlipper {
   public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
     if (FlipperUtils.shouldEnableFlipper(context)) {
       final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
       client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
       client.addPlugin(new ReactFlipperPlugin());
       client.addPlugin(new DatabasesFlipperPlugin(context));
       client.addPlugin(new SharedPreferencesFlipperPlugin(context));
       client.addPlugin(CrashReporterPlugin.getInstance());
+
       NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
       NetworkingModule.setCustomClientBuilder(
           new NetworkingModule.CustomClientBuilder() {
@@ -41,6 +45,7 @@ public void apply(OkHttpClient.Builder builder) {
           });
       client.addPlugin(networkFlipperPlugin);
       client.start();
+
       // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
       // Hence we run if after all native modules have been initialized
       ReactContext reactContext = reactInstanceManager.getCurrentReactContext();

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 

diff --git a/android/build.gradle b/android/build.gradle
@@ -9,6 +9,7 @@ buildscript {
         kotlinVersion = "1.3.72"
         RNNKotlinVersion = kotlinVersion
         supportLibVersion = "28.0.0"
+        ndkVersion = "20.1.5948944"
     }
     repositories {
         google()
@@ -18,7 +19,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath("com.android.tools.build:gradle:4.1.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -26,4 +26,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0
+FLIPPER_VERSION=0.75.1
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/ios/FridayApp-tvOS/Info.plist b/ios/FridayApp-tvOS/Info.plist
diff --git a/ios/FridayApp-tvOSTests/Info.plist b/ios/FridayApp-tvOSTests/Info.plist