Skip to content

Commit f9b9d3c

Browse files
jamonholmgrenjamonholmgren
committed
Rename ReactWebView to RNCWebView, remove more infinitered references
1 parent bc3be5e commit f9b9d3c

14 files changed

+117
-51
lines changed

Diff for: ‎WebTest/android/app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ android {
137137
}
138138

139139
dependencies {
140+
compile project(':react-native-webview')
140141
compile fileTree(dir: "libs", include: ["*.jar"])
141142
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
142143
compile "com.facebook.react:react-native:+" // From node_modules

Diff for: ‎WebTest/android/app/src/main/java/com/webtest/MainApplication.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6+
import com.reactnativecommunity.webview.RNCWebViewPackage;
67
import com.facebook.react.ReactNativeHost;
78
import com.facebook.react.ReactPackage;
89
import com.facebook.react.shell.MainReactPackage;
@@ -22,7 +23,8 @@ public boolean getUseDeveloperSupport() {
2223
@Override
2324
protected List<ReactPackage> getPackages() {
2425
return Arrays.<ReactPackage>asList(
25-
new MainReactPackage()
26+
new MainReactPackage(),
27+
new RNCWebViewPackage()
2628
);
2729
}
2830

Diff for: ‎WebTest/android/settings.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
rootProject.name = 'WebTest'
2+
include ':react-native-webview'
3+
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
24

35
include ':app'

Diff for: ‎WebTest/ios/WebTest.xcodeproj/project.pbxproj

+62-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
};
66
objectVersion = 46;
77
objects = {
8-
98
/* Begin PBXBuildFile section */
109
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1110
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -38,6 +37,7 @@
3837
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3938
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
4039
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
40+
0DEB930C40564C6EA64B2F22 /* libRNCWebView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 694F766453F2454298825A66 /* libRNCWebView.a */; };
4141
/* End PBXBuildFile section */
4242

4343
/* Begin PBXContainerItemProxy section */
@@ -343,6 +343,8 @@
343343
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
344344
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
345345
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
346+
145424F98F774DD4816B6AB1 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; name = "RNCWebView.xcodeproj"; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
347+
694F766453F2454298825A66 /* libRNCWebView.a */ = {isa = PBXFileReference; name = "libRNCWebView.a"; path = "libRNCWebView.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
346348
/* End PBXFileReference section */
347349

348350
/* Begin PBXFrameworksBuildPhase section */
@@ -371,6 +373,7 @@
371373
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
372374
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
373375
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
376+
0DEB930C40564C6EA64B2F22 /* libRNCWebView.a in Frameworks */,
374377
);
375378
runOnlyForDeploymentPostprocessing = 0;
376379
};
@@ -557,6 +560,7 @@
557560
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
558561
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
559562
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
563+
145424F98F774DD4816B6AB1 /* RNCWebView.xcodeproj */,
560564
);
561565
name = Libraries;
562566
sourceTree = "<group>";
@@ -685,7 +689,7 @@
685689
83CBB9F71A601CBA00E9B192 /* Project object */ = {
686690
isa = PBXProject;
687691
attributes = {
688-
LastUpgradeCheck = 0610;
692+
LastUpgradeCheck = 610;
689693
ORGANIZATIONNAME = Facebook;
690694
TargetAttributes = {
691695
00E356ED1AD99517003FC87E = {
@@ -1181,6 +1185,14 @@
11811185
);
11821186
PRODUCT_NAME = "$(TARGET_NAME)";
11831187
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest.app/WebTest";
1188+
LIBRARY_SEARCH_PATHS = (
1189+
"$(inherited)",
1190+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1191+
);
1192+
HEADER_SEARCH_PATHS = (
1193+
"$(inherited)",
1194+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1195+
);
11841196
};
11851197
name = Debug;
11861198
};
@@ -1198,6 +1210,14 @@
11981210
);
11991211
PRODUCT_NAME = "$(TARGET_NAME)";
12001212
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest.app/WebTest";
1213+
LIBRARY_SEARCH_PATHS = (
1214+
"$(inherited)",
1215+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1216+
);
1217+
HEADER_SEARCH_PATHS = (
1218+
"$(inherited)",
1219+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1220+
);
12011221
};
12021222
name = Release;
12031223
};
@@ -1216,6 +1236,10 @@
12161236
);
12171237
PRODUCT_NAME = WebTest;
12181238
VERSIONING_SYSTEM = "apple-generic";
1239+
HEADER_SEARCH_PATHS = (
1240+
"$(inherited)",
1241+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1242+
);
12191243
};
12201244
name = Debug;
12211245
};
@@ -1233,6 +1257,10 @@
12331257
);
12341258
PRODUCT_NAME = WebTest;
12351259
VERSIONING_SYSTEM = "apple-generic";
1260+
HEADER_SEARCH_PATHS = (
1261+
"$(inherited)",
1262+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1263+
);
12361264
};
12371265
name = Release;
12381266
};
@@ -1259,6 +1287,14 @@
12591287
SDKROOT = appletvos;
12601288
TARGETED_DEVICE_FAMILY = 3;
12611289
TVOS_DEPLOYMENT_TARGET = 9.2;
1290+
LIBRARY_SEARCH_PATHS = (
1291+
"$(inherited)",
1292+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1293+
);
1294+
HEADER_SEARCH_PATHS = (
1295+
"$(inherited)",
1296+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1297+
);
12621298
};
12631299
name = Debug;
12641300
};
@@ -1285,6 +1321,14 @@
12851321
SDKROOT = appletvos;
12861322
TARGETED_DEVICE_FAMILY = 3;
12871323
TVOS_DEPLOYMENT_TARGET = 9.2;
1324+
LIBRARY_SEARCH_PATHS = (
1325+
"$(inherited)",
1326+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1327+
);
1328+
HEADER_SEARCH_PATHS = (
1329+
"$(inherited)",
1330+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1331+
);
12881332
};
12891333
name = Release;
12901334
};
@@ -1310,6 +1354,14 @@
13101354
SDKROOT = appletvos;
13111355
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest-tvOS.app/WebTest-tvOS";
13121356
TVOS_DEPLOYMENT_TARGET = 10.1;
1357+
LIBRARY_SEARCH_PATHS = (
1358+
"$(inherited)",
1359+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1360+
);
1361+
HEADER_SEARCH_PATHS = (
1362+
"$(inherited)",
1363+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1364+
);
13131365
};
13141366
name = Debug;
13151367
};
@@ -1335,6 +1387,14 @@
13351387
SDKROOT = appletvos;
13361388
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WebTest-tvOS.app/WebTest-tvOS";
13371389
TVOS_DEPLOYMENT_TARGET = 10.1;
1390+
LIBRARY_SEARCH_PATHS = (
1391+
"$(inherited)",
1392+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1393+
);
1394+
HEADER_SEARCH_PATHS = (
1395+
"$(inherited)",
1396+
"$(SRCROOT)/../node_modules/react-native-webview/ios/**",
1397+
);
13381398
};
13391399
name = Release;
13401400
};

Diff for: ‎WebTest/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
},
99
"dependencies": {
1010
"react": "16.4.1",
11-
"react-native": "0.56.0"
11+
"react-native": "0.56.0",
12+
"react-native-webview": "../"
1213
},
1314
"devDependencies": {
1415
"@babel/core": "^7.0.0-beta",

Diff for: ‎android/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.infinitered.webview">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.reactnativecommunity.webview">
22
</manifest>

0 commit comments

Comments
 (0)