Skip to content

Commit a13e7e2

Browse files
drewvolzhawkrives
drewvolz
authored and
hawkrives
committed
Remove codepush entirely
1 parent f21f93a commit a13e7e2

File tree

17 files changed

+4
-130
lines changed

17 files changed

+4
-130
lines changed

‎android/app/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ project.ext.react = [
7171
]
7272

7373
apply from: "../../node_modules/react-native/react.gradle"
74-
apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
7574

7675
/**
7776
* Set this to true to create two separate APKs instead of one:
@@ -146,7 +145,6 @@ android {
146145
dependencies {
147146
// please keep this list sorted
148147
compile project(':bugsnag-react-native')
149-
compile project(':react-native-code-push')
150148
compile project(':react-native-custom-tabs')
151149
compile project(':react-native-device-info')
152150
compile project(':react-native-google-analytics-bridge')

‎android/app/src/main/java/com/allaboutolaf/MainApplication.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
2020
import com.idehub.GoogleAnalyticsBridge.GoogleAnalyticsBridgePackage;
2121
import com.learnium.RNDeviceInfo.RNDeviceInfo;
22-
import com.microsoft.codepush.react.CodePush;
2322
import com.oblador.keychain.KeychainPackage;
2423
import com.oblador.vectoricons.VectorIconsPackage;
2524
import com.pusherman.networkinfo.RNNetworkInfoPackage;
@@ -33,11 +32,6 @@
3332
public class MainApplication extends Application implements ReactApplication {
3433

3534
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
36-
@Override
37-
protected String getJSBundleFile() {
38-
return CodePush.getJSBundleFile();
39-
}
40-
4135
@Override
4236
public boolean getUseDeveloperSupport() {
4337
return BuildConfig.DEBUG;
@@ -49,7 +43,6 @@ protected List<ReactPackage> getPackages() {
4943
new MainReactPackage(),
5044
// please keep these sorted alphabetically
5145
BugsnagReactNative.getPackage(),
52-
new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG),
5346
new CustomTabsPackage(),
5447
new GoogleAnalyticsBridgePackage(),
5548
new KeychainPackage(),

‎android/app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<resources>
2-
<string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey">5jvlQ5-xBItoSRqf-D-3hqdEsPTLEJN_nzUOz</string>
32
<string name="app_name">All About Olaf</string>
43
</resources>

‎android/settings.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ include ':app'
55
include ':bugsnag-react-native'
66
project(':bugsnag-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/bugsnag-react-native/android')
77

8-
include ':react-native-code-push'
9-
project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
108

119
include ':react-native-custom-tabs'
1210
project(':react-native-custom-tabs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-custom-tabs/android')

‎fastlane/README.md‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ Run the appropriate action on CI
7373
fastlane android set_version
7474
```
7575
Include the build number in the version string
76-
### android codepush
77-
```
78-
fastlane android codepush
79-
```
80-
8176

8277
----
8378

@@ -112,11 +107,6 @@ Upload dYSM symbols to Bugsnag from Apple
112107
fastlane ios ci-run
113108
```
114109
Run iOS builds or tests, as appropriate
115-
### ios codepush
116-
```
117-
fastlane ios codepush
118-
```
119-
120110
### ios set_version
121111
```
122112
fastlane ios set_version

‎fastlane/lib/util.rb‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,3 @@ def auto_beta
6666

6767
beta if last_commit != current_commit
6868
end
69-
70-
def codepush_cli(app:, channel: 'nightly', install_target: '~2.2 || ~2.2.0-beta')
71-
target = "--targetBinaryVersion '#{install_target}'"
72-
# `fastlane x` runs in the ./fastlane folder, so we have to go up a level
73-
Dir.chdir("..") do
74-
sh("code-push release-react '#{app}' ios -d '#{channel}' #{target}")
75-
end
76-
end

‎fastlane/platforms/android.rb‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
should_deploy = ENV['run_deploy'] == '1'
4040
if should_deploy
4141
auto_beta
42-
codepush
4342
else
4443
build
4544
end
@@ -55,8 +54,4 @@
5554
gradle_path: lane_context[:GRADLE_FILE])
5655
set_package_data(data: { version: "#{version}+#{build}" })
5756
end
58-
59-
lane :codepush do
60-
codepush_cli(app: 'AllAboutOlaf-Android')
61-
end
6257
end

‎fastlane/platforms/ios.rb‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,11 @@
5757
should_deploy = ENV['run_deploy'] == '1'
5858
if should_deploy
5959
auto_beta
60-
codepush
6160
else
6261
build
6362
end
6463
end
6564

66-
lane :codepush do
67-
codepush_cli(app: 'AllAboutOlaf-iOS')
68-
end
69-
7065
desc 'Include the build number in the version string'
7166
lane :set_version do |options|
7267
version = options[:version] || current_bundle_version
@@ -86,7 +81,7 @@
8681
create_keychain(name: keychain,
8782
password: password,
8883
timeout: 3600)
89-
84+
9085
# Set up code signing correctly
9186
# (more information: https://codesigning.guide)
9287
match(type: 'appstore', readonly: true)

‎ios/AllAboutOlaf.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
9304AFEA1BEF4D77A9BE9E47 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EFDF596D3434455B7F672D3 /* libRNVectorIcons.a */; };
4242
9E5D73F8D3CC4F7499359624 /* libRNNetworkInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C476D4877F945308C96FF0F /* libRNNetworkInfo.a */; };
4343
A0102781BF874C25BD76AD1D /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D51A8982104BF29657933B /* libRNDeviceInfo.a */; };
44-
A3D56267BEA24AB583A6D2A2 /* libCodePush.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E90E6CCE2A464D80BE6D83B2 /* libCodePush.a */; };
4544
A90299E6C1BD45C385BBF8F0 /* libDBCustomTabs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D222CA78E6554BBB83448435 /* libDBCustomTabs.a */; };
4645
BBDFD91C684046CB9FD0CD55 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 742B362B86E443C09A7F9FD9 /* Entypo.ttf */; };
4746
/* End PBXBuildFile section */
@@ -257,13 +256,6 @@
257256
remoteGlobalIDString = 134814201AA4EA6300B7C361;
258257
remoteInfo = RNSearchBar;
259258
};
260-
00D67CC91E5005DF00379DD7 /* PBXContainerItemProxy */ = {
261-
isa = PBXContainerItemProxy;
262-
containerPortal = AECB3DDD098E445D8AB3555F /* CodePush.xcodeproj */;
263-
proxyType = 2;
264-
remoteGlobalIDString = 134814201AA4EA6300B7C361;
265-
remoteInfo = CodePush;
266-
};
267259
00DE0C341E7C3087005F3CE3 /* PBXContainerItemProxy */ = {
268260
isa = PBXContainerItemProxy;
269261
containerPortal = 59C781128E0B476A8826CD12 /* BugsnagReactNative.xcodeproj */;
@@ -392,7 +384,6 @@
392384
9C476D4877F945308C96FF0F /* libRNNetworkInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNNetworkInfo.a; sourceTree = "<group>"; };
393385
A2D51A8982104BF29657933B /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = "<group>"; };
394386
A91038679F834707B769D282 /* RNKeychain.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNKeychain.xcodeproj; path = "../node_modules/react-native-keychain/RNKeychain.xcodeproj"; sourceTree = "<group>"; };
395-
AECB3DDD098E445D8AB3555F /* CodePush.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = CodePush.xcodeproj; path = "../node_modules/react-native-code-push/ios/CodePush.xcodeproj"; sourceTree = "<group>"; };
396387
B4920CEFDAA947C8B63B7C8B /* libBugsnagReactNative.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBugsnagReactNative.a; sourceTree = "<group>"; };
397388
BC36B827687E41ADA029DA16 /* libRNSearchBar.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSearchBar.a; sourceTree = "<group>"; };
398389
C1122D5F37D247E09037EE31 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
@@ -403,7 +394,6 @@
403394
D530CE76BA714A59B2BECB28 /* libSafariViewManager.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libSafariViewManager.a; sourceTree = "<group>"; };
404395
E288E9E30083441F948E40BF /* RNSearchBar.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSearchBar.xcodeproj; path = "../node_modules/react-native-search-bar/RNSearchBar.xcodeproj"; sourceTree = "<group>"; };
405396
E6FBE71A05CC43E2B4885180 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
406-
E90E6CCE2A464D80BE6D83B2 /* libCodePush.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libCodePush.a; sourceTree = "<group>"; };
407397
F803FE6585F04E9F8D3C053F /* libRCTGoogleAnalyticsBridge.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTGoogleAnalyticsBridge.a; sourceTree = "<group>"; };
408398
/* End PBXFileReference section */
409399

@@ -439,7 +429,6 @@
439429
1848577634C04472802C4F91 /* libRCTGoogleAnalyticsBridge.a in Frameworks */,
440430
37755BD2F66641FB97979B7E /* libRCTOneSignal.a in Frameworks */,
441431
24C1AB28D1424CD095CB8582 /* libRNKeychain.a in Frameworks */,
442-
A3D56267BEA24AB583A6D2A2 /* libCodePush.a in Frameworks */,
443432
56DC65C1BF07427AA1F84CFC /* libSafariViewManager.a in Frameworks */,
444433
A90299E6C1BD45C385BBF8F0 /* libDBCustomTabs.a in Frameworks */,
445434
570ACE6B68F941838FFABAA9 /* libRNViewShot.a in Frameworks */,
@@ -595,14 +584,6 @@
595584
name = Products;
596585
sourceTree = "<group>";
597586
};
598-
00D67CC61E5005DF00379DD7 /* Products */ = {
599-
isa = PBXGroup;
600-
children = (
601-
00D67CCA1E5005DF00379DD7 /* libCodePush.a */,
602-
);
603-
name = Products;
604-
sourceTree = "<group>";
605-
};
606587
00DE0C311E7C3087005F3CE3 /* Products */ = {
607588
isa = PBXGroup;
608589
children = (
@@ -727,7 +708,6 @@
727708
36AB9BDB6CF1449E997C6D74 /* AirMaps.xcodeproj */,
728709
59C781128E0B476A8826CD12 /* BugsnagReactNative.xcodeproj */,
729710
C1122D5F37D247E09037EE31 /* BVLinearGradient.xcodeproj */,
730-
AECB3DDD098E445D8AB3555F /* CodePush.xcodeproj */,
731711
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
732712
3A0CEA711DEA20340036E739 /* RCTAnimation.xcodeproj */,
733713
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
@@ -879,10 +859,6 @@
879859
ProductGroup = 00CF91E61E770EF900DD9CBC /* Products */;
880860
ProjectRef = C1122D5F37D247E09037EE31 /* BVLinearGradient.xcodeproj */;
881861
},
882-
{
883-
ProductGroup = 00D67CC61E5005DF00379DD7 /* Products */;
884-
ProjectRef = AECB3DDD098E445D8AB3555F /* CodePush.xcodeproj */;
885-
},
886862
{
887863
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
888864
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -1188,13 +1164,6 @@
11881164
remoteRef = 00D4C3481EB97C9900733278 /* PBXContainerItemProxy */;
11891165
sourceTree = BUILT_PRODUCTS_DIR;
11901166
};
1191-
00D67CCA1E5005DF00379DD7 /* libCodePush.a */ = {
1192-
isa = PBXReferenceProxy;
1193-
fileType = archive.ar;
1194-
path = libCodePush.a;
1195-
remoteRef = 00D67CC91E5005DF00379DD7 /* PBXContainerItemProxy */;
1196-
sourceTree = BUILT_PRODUCTS_DIR;
1197-
};
11981167
00DE0C351E7C3087005F3CE3 /* libBugsnagReactNative.a */ = {
11991168
isa = PBXReferenceProxy;
12001169
fileType = archive.ar;
@@ -1423,7 +1392,6 @@
14231392
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
14241393
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
14251394
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1426-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
14271395
"$(SRCROOT)/../node_modules/react-native-safari-view",
14281396
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
14291397
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
@@ -1469,7 +1437,6 @@
14691437
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
14701438
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
14711439
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1472-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
14731440
"$(SRCROOT)/../node_modules/react-native-safari-view",
14741441
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
14751442
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
@@ -1543,7 +1510,6 @@
15431510
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
15441511
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
15451512
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1546-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
15471513
"$(SRCROOT)/../node_modules/react-native-safari-view",
15481514
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
15491515
);
@@ -1596,7 +1562,6 @@
15961562
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
15971563
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
15981564
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1599-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
16001565
"$(SRCROOT)/../node_modules/react-native-safari-view",
16011566
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
16021567
);

‎ios/AllAboutOlaf/AppDelegate.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
#import "AppDelegate.h"
11-
#import <CodePush/CodePush.h>
1211
#import <BugsnagReactNative/BugsnagReactNative.h>
1312

1413
#import <React/RCTBundleURLProvider.h>
@@ -24,13 +23,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
2423
{
2524
NSURL *jsCodeLocation;
2625

27-
#ifdef DEBUG
2826
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios"
2927
fallbackResource:nil];
30-
#else
31-
jsCodeLocation = [CodePush bundleURL];
32-
#endif
33-
3428
#ifndef DEBUG
3529
[BugsnagReactNative start];
3630
#endif

0 commit comments

Comments
 (0)