Skip to content

Commit 5f36c52

Browse files
authored
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
1 parent b79f275 commit 5f36c52

File tree

19 files changed

+3191
-3803
lines changed

19 files changed

+3191
-3803
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
*.pbxproj -text
2+
3+
4+
# Windows files should use crlf line endings
5+
# https://help.github.com/articles/dealing-with-line-endings/
6+
*.bat text eol=crlf

.prettierrc.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module.exports = {
2+
bracketSpacing: false,
3+
jsxBracketSameLine: true,
4+
singleQuote: true,
5+
trailingComma: 'all',
6+
arrowParens: 'avoid',
7+
};

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ ___
1212

1313
| Updates | RNN | RN | React | Comments |
1414
|---|---|---|---|---|
15-
| 07 Oct '20 | 7.1.0 | 0.63.3 | 16.13.1 | Support for Flipper
16-
| 27 Apr '20 | 3.7.0 | 0.61.5 | 16.9.0 | Support for RN > 0.60, Android X
17-
| 02 Nov '19 | 2.26.2 | 0.59.10 | | Maintenance |
18-
| 08 Mar '19 | 2.13.1 | 0.58.6 | 16.8.4 |
15+
| May '21 | 7.14.0 | 0.64.1 | 17.0.1 | Update RN RNN, Hermes Support
16+
| Oct '20 | 7.1.0 | 0.63.3 | 16.13.1 | Support for Flipper
17+
| Apr '20 | 3.7.0 | 0.61.5 | 16.9.0 | Support for RN > 0.60, Android X
18+
| Nov '19 | 2.26.2 | 0.59.10 | | Maintenance |
19+
| Mar '19 | 2.13.1 | 0.58.6 | 16.8.4 |
1920

2021
## Introduction
2122

android/app/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import com.android.build.OutputFile
7878
*/
7979

8080
project.ext.react = [
81-
entryFile: "index.js",
81+
// entryFile: "index.js",
8282
enableHermes: false, // clean and rebuild if changing
8383
// hermesCommand: "../../node_modules/hermes-engine/%OS-BIN%/hermes"
8484
bundleInDebug: true
@@ -124,6 +124,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
124124
def enableHermes = project.ext.react.get("enableHermes", false);
125125

126126
android {
127+
ndkVersion rootProject.ext.ndkVersion
127128
compileSdkVersion rootProject.ext.compileSdkVersion
128129
buildToolsVersion rootProject.ext.buildToolsVersion
129130

@@ -133,7 +134,7 @@ android {
133134
targetSdkVersion rootProject.ext.targetSdkVersion
134135
versionCode 1
135136
versionName "1.0"
136-
missingDimensionStrategy "RNN.reactNativeVersion", "reactNative57"
137+
// sourceCompatibility "RNN.reactNativeVersion", "reactNative57"
137138
ndk {
138139
abiFilters "armeabi-v7a", "x86", 'armeabi', 'arm64-v8a'
139140
}
@@ -184,15 +185,17 @@ android {
184185
dependencies {
185186
implementation fileTree(dir: "libs", include: ["*.jar"])
186187
// implementation project(':react-native-navigation')
187-
//noinspection GradleDynamicVersion
188+
// noinspection GradleDynamicVersion
188189
implementation "com.facebook.react:react-native:+" // From node_modules
190+
compile 'com.android.support:multidex:1.0.0'
189191

190192
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
191193
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
192194
exclude group:'com.facebook.fbjni'
193195
}
194196
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
195197
exclude group:'com.facebook.flipper'
198+
exclude group:'com.squareup.okhttp3', module:'okhttp'
196199
}
197200
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
198201
exclude group:'com.facebook.flipper'
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
6+
7+
<application
8+
android:usesCleartextTraffic="true"
9+
tools:targetApi="28"
10+
tools:ignore="GoogleAppIndexingWarning">
11+
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
12+
</application>
13+
</manifest>

android/app/src/debug/java/com/fridayapp/ReactNativeFlipper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* directory of this source tree.
66
*/
77
package com.rndiffapp;
8+
89
import android.content.Context;
910
import com.facebook.flipper.android.AndroidFlipperClient;
1011
import com.facebook.flipper.android.utils.FlipperUtils;
@@ -22,15 +23,18 @@
2223
import com.facebook.react.bridge.ReactContext;
2324
import com.facebook.react.modules.network.NetworkingModule;
2425
import okhttp3.OkHttpClient;
26+
2527
public class ReactNativeFlipper {
2628
public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
2729
if (FlipperUtils.shouldEnableFlipper(context)) {
2830
final FlipperClient client = AndroidFlipperClient.getInstance(context);
31+
2932
client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
3033
client.addPlugin(new ReactFlipperPlugin());
3134
client.addPlugin(new DatabasesFlipperPlugin(context));
3235
client.addPlugin(new SharedPreferencesFlipperPlugin(context));
3336
client.addPlugin(CrashReporterPlugin.getInstance());
37+
3438
NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
3539
NetworkingModule.setCustomClientBuilder(
3640
new NetworkingModule.CustomClientBuilder() {
@@ -41,6 +45,7 @@ public void apply(OkHttpClient.Builder builder) {
4145
});
4246
client.addPlugin(networkFlipperPlugin);
4347
client.start();
48+
4449
// Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
4550
// Hence we run if after all native modules have been initialized
4651
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();

android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
4+
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
55
<!-- Customize your theme here. -->
66
</style>
77

android/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ buildscript {
99
kotlinVersion = "1.3.72"
1010
RNNKotlinVersion = kotlinVersion
1111
supportLibVersion = "28.0.0"
12+
ndkVersion = "20.1.5948944"
1213
}
1314
repositories {
1415
google()
@@ -18,7 +19,7 @@ buildscript {
1819
}
1920
dependencies {
2021
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
21-
classpath 'com.android.tools.build:gradle:3.5.3'
22+
classpath("com.android.tools.build:gradle:4.1.0")
2223

2324
// NOTE: Do not place your application dependencies here; they belong
2425
// in the individual module build.gradle files

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ android.useAndroidX=true
2626
android.enableJetifier=true
2727

2828
# Version of flipper SDK to use with React Native
29-
FLIPPER_VERSION=0.37.0
29+
FLIPPER_VERSION=0.75.1

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

ios/FridayApp-tvOS/Info.plist

Lines changed: 0 additions & 54 deletions
This file was deleted.

ios/FridayApp-tvOSTests/Info.plist

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)