Skip to content

Commit 17cbc2c

Browse files
committed
fix(android): runnable without CodePush and react-native-photo-view
1 parent 468a68c commit 17cbc2c

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ project.ext.react = [
8686

8787
apply from: "../../node_modules/react-native/react.gradle"
8888
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
89-
apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
89+
// apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
9090
apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
9191

9292
/**
@@ -153,9 +153,9 @@ dependencies {
153153
compile project(':react-native-linear-gradient')
154154
compile project(':react-native-cookies')
155155
compile project(':react-native-i18n')
156-
compile project(':react-native-photo-view')
156+
// compile project(':react-native-photo-view')
157157
compile project(':react-native-config')
158-
compile project(':react-native-code-push')
158+
// compile project(':react-native-code-push')
159159
compile project(':react-native-device-info')
160160
implementation fileTree(dir: "libs", include: ["*.jar"])
161161
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"

android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
44
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
5-
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
5+
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:appComponentFactory" android:appComponentFactory="anyFactoryName" />
66
</manifest>

android/app/src/main/java/com/gitpoint/MainApplication.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import com.BV.LinearGradient.LinearGradientPackage;
88
import com.psykar.cookiemanager.CookieManagerPackage;
99
import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
10-
import com.reactnative.photoview.PhotoViewPackage;
10+
// import com.reactnative.photoview.PhotoViewPackage;
1111
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
12-
import com.microsoft.codepush.react.CodePush;
12+
// import com.microsoft.codepush.react.CodePush;
1313
import com.learnium.RNDeviceInfo.RNDeviceInfo;
1414
import com.oblador.vectoricons.VectorIconsPackage;
1515
import com.facebook.react.ReactNativeHost;
@@ -24,10 +24,10 @@ public class MainApplication extends Application implements ReactApplication {
2424

2525
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
2626

27-
@Override
28-
protected String getJSBundleFile() {
29-
return CodePush.getJSBundleFile();
30-
}
27+
// @Override
28+
// protected String getJSBundleFile() {
29+
// return CodePush.getJSBundleFile();
30+
// }
3131

3232
@Override
3333
public boolean getUseDeveloperSupport() {
@@ -42,9 +42,9 @@ protected List<ReactPackage> getPackages() {
4242
new LinearGradientPackage(),
4343
new CookieManagerPackage(),
4444
new RNI18nPackage(),
45-
new PhotoViewPackage(),
45+
// new PhotoViewPackage(),
4646
new ReactNativeConfigPackage(),
47-
new CodePush(BuildConfig.CODEPUSH_ANDROID_DEPLOYMENT_KEY, MainApplication.this, BuildConfig.DEBUG),
47+
// new CodePush(BuildConfig.CODEPUSH_ANDROID_DEPLOYMENT_KEY, MainApplication.this, BuildConfig.DEBUG),
4848
new RNDeviceInfo(),
4949
new VectorIconsPackage()
5050
);

android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19+
20+
android.useAndroidX=true
21+
android.enableJetifier=true

android/settings.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ include ':react-native-cookies'
77
project(':react-native-cookies').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-cookies/android')
88
include ':react-native-i18n'
99
project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')
10-
include ':react-native-photo-view'
11-
project(':react-native-photo-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-photo-view/android')
10+
// include ':react-native-photo-view'
11+
// project(':react-native-photo-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-photo-view/android')
1212
include ':react-native-config'
1313
project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
14-
include ':react-native-code-push'
15-
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
14+
// include ':react-native-code-push'
15+
// project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
1616
include ':react-native-device-info'
1717
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
1818
include ':react-native-vector-icons'

0 commit comments

Comments
 (0)