Skip to content

Commit

Permalink
Revert "Fix Android build errors." & "Upgrade React Native to 0.70.4."
Browse files Browse the repository at this point in the history
This reverts commit 493ac26 & cc9e8b8.
  • Loading branch information
vincentritter committed Nov 5, 2022
1 parent 493ac26 commit 4b9a911
Show file tree
Hide file tree
Showing 41 changed files with 1,184 additions and 2,081 deletions.
2 changes: 0 additions & 2 deletions .bundle/config

This file was deleted.

3 changes: 3 additions & 0 deletions .editorconfig
@@ -0,0 +1,3 @@
# Windows files
[*.bat]
end_of_line = crlf
3 changes: 3 additions & 0 deletions .gitattributes
@@ -0,0 +1,3 @@
# Windows files should use crlf line endings
# https://help.github.com/articles/dealing-with-line-endings/
*.bat text eol=crlf
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -62,4 +62,4 @@ buck-out/
/android/java_pid46681.hprof
*.hprof
/android/app/google-services.json
vendor
vendor
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

4 changes: 2 additions & 2 deletions .prettierrc.js
@@ -1,7 +1,7 @@
module.exports = {
arrowParens: 'avoid',
bracketSameLine: true,
bracketSpacing: false,
jsxBracketSameLine: true,
singleQuote: true,
trailingComma: 'all',
arrowParens: 'avoid',
};
1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

6 changes: 0 additions & 6 deletions Gemfile

This file was deleted.

100 changes: 0 additions & 100 deletions Gemfile.lock

This file was deleted.

25 changes: 4 additions & 21 deletions android/app/build.gradle
Expand Up @@ -187,23 +187,8 @@ android {

}
}
packagingOptions {
pickFirst '**/armeabi-v7a/libfolly_runtime.so'
pickFirst '**/x86/libfolly_runtime.so'
pickFirst '**/arm64-v8a/libfolly_runtime.so'
pickFirst '**/x86_64/libfolly_runtime.so'
}
}

//configurations.all {
// resolutionStrategy.eachDependency { DependencyResolveDetails details ->
// def requested = details.requested
// if (requested.group == 'com.android.support' && requested.name != 'multidex') {
// details.useVersion "${rootProject.ext.supportLibVersion}"
// }
// }
//}

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
//noinspection GradleDynamicVersion
Expand All @@ -221,21 +206,19 @@ dependencies {
}

debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
exclude group: 'com.facebook.flipper'
exclude group:'com.facebook.flipper'
}

if (enableHermes) {
implementation("com.facebook.react:hermes-engine:+") { // From node_modules
exclude group:'com.facebook.fbjni'
}
def hermesPath = "../../node_modules/hermes-engine/android/"
debugImplementation files(hermesPath + "hermes-debug.aar")
releaseImplementation files(hermesPath + "hermes-release.aar")
} else {
implementation jscFlavor
}

implementation platform('com.google.firebase:firebase-bom:29.0.4')
implementation 'com.google.firebase:firebase-core:16.0.0'
// implementation 'com.android.support:design:25.4.0'
// implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
}

// Run this once to be able to run the application with BUCK
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Expand Up @@ -8,6 +8,6 @@
android:usesCleartextTraffic="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
</manifest>
@@ -1,5 +1,5 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
* Copyright (c) Facebook, Inc. and its affiliates.
*
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
Expand All @@ -19,7 +19,6 @@
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
import com.facebook.react.ReactInstanceEventListener;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.network.NetworkingModule;
Expand Down Expand Up @@ -52,7 +51,7 @@ public void apply(OkHttpClient.Builder builder) {
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
if (reactContext == null) {
reactInstanceManager.addReactInstanceEventListener(
new ReactInstanceEventListener() {
new ReactInstanceManager.ReactInstanceEventListener() {
@Override
public void onReactContextInitialized(ReactContext reactContext) {
reactInstanceManager.removeReactInstanceEventListener(this);
Expand Down
8 changes: 3 additions & 5 deletions android/app/src/main/AndroidManifest.xml
Expand Up @@ -13,16 +13,15 @@
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher"
android:allowBackup="false"
android:theme="@style/AppTheme"
android:exported="true">
android:theme="@style/AppTheme">

<meta-data android:name="com.dieam.reactnativepushnotification.notification_foreground" android:value="true"/>
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_notification" />
<meta-data android:name="com.google.firebase.messaging." android:resource="@drawable/ic_notification" />
<meta-data android:name="com.dieam.reactnativepushnotification.notification_color" android:resource="@color/notification"/>
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver" android:exported="true">
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
Expand All @@ -41,7 +40,6 @@
<activity
android:name=".SplashActivity"
android:theme="@style/SplashTheme"
android:exported="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -53,7 +51,7 @@
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize" android:theme="@style/AppTheme" android:exported="true">
android:windowSoftInputMode="adjustResize" android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
Expand Down

This file was deleted.

0 comments on commit 4b9a911

Please sign in to comment.