Skip to content

Commit a6cb0d6

Browse files
hawkriveshawkrives
authored
Merge branch 'master' into react-native-restart
2 parents be4a78c + 26dc609 commit a6cb0d6

File tree

16 files changed

+6
-133
lines changed

16 files changed

+6
-133
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:
@@ -185,7 +184,6 @@ if (propFile.canRead()) {
185184
dependencies {
186185
// please keep this list sorted
187186
compile project(':bugsnag-react-native')
188-
compile project(':react-native-code-push')
189187
compile project(':react-native-custom-tabs')
190188
compile project(':react-native-device-info')
191189
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
@@ -20,7 +20,6 @@
2020
import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
2121
import com.idehub.GoogleAnalyticsBridge.GoogleAnalyticsBridgePackage;
2222
import com.learnium.RNDeviceInfo.RNDeviceInfo;
23-
import com.microsoft.codepush.react.CodePush;
2423
import com.oblador.keychain.KeychainPackage;
2524
import com.oblador.vectoricons.VectorIconsPackage;
2625
import com.pusherman.networkinfo.RNNetworkInfoPackage;
@@ -34,11 +33,6 @@
3433
public class MainApplication extends Application implements ReactApplication {
3534

3635
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
37-
@Override
38-
protected String getJSBundleFile() {
39-
return CodePush.getJSBundleFile();
40-
}
41-
4236
@Override
4337
public boolean getUseDeveloperSupport() {
4438
return BuildConfig.DEBUG;
@@ -50,7 +44,6 @@ protected List<ReactPackage> getPackages() {
5044
new MainReactPackage(),
5145
// please keep these sorted alphabetically
5246
BugsnagReactNative.getPackage(),
53-
new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG),
5447
new CustomTabsPackage(),
5548
new GoogleAnalyticsBridgePackage(),
5649
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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +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')
10-
118
include ':react-native-custom-tabs'
129
project(':react-native-custom-tabs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-custom-tabs/android')
1310

‎fastlane/README.md‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@ Run the appropriate action on CI
7878
fastlane android set_version
7979
```
8080
Include the build number in the version string
81-
### android codepush
82-
```
83-
fastlane android codepush
84-
```
85-
8681
### android matchesque
8782
```
8883
fastlane android matchesque
@@ -122,11 +117,6 @@ Upload dYSM symbols to Bugsnag from Apple
122117
fastlane ios ci-run
123118
```
124119
Run iOS builds or tests, as appropriate
125-
### ios codepush
126-
```
127-
fastlane ios codepush
128-
```
129-
130120
### ios set_version
131121
```
132122
fastlane ios set_version

‎fastlane/lib/util.rb‎

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

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

‎fastlane/platforms/android.rb‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
build_type: 'Release',
99
print_command: true,
1010
print_command_output: true)
11-
11+
1212
UI.message lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS]
1313
end
1414

@@ -42,7 +42,6 @@
4242
should_deploy = ENV['run_deploy'] == '1'
4343
if should_deploy
4444
auto_beta
45-
codepush
4645
else
4746
build
4847
end
@@ -56,10 +55,6 @@
5655
set_package_data(data: { version: "#{version}" })
5756
end
5857

59-
lane :codepush do
60-
codepush_cli(app: 'AllAboutOlaf-Android')
61-
end
62-
6358
desc 'extract the android keys from the match repo'
6459
lane :matchesque do
6560
match_dir = clone_match

‎fastlane/platforms/ios.rb‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,11 @@
5555
should_deploy = ENV['run_deploy'] == '1'
5656
if should_deploy
5757
auto_beta
58-
codepush
5958
else
6059
build
6160
end
6261
end
6362

64-
lane :codepush do
65-
codepush_cli(app: 'AllAboutOlaf-iOS')
66-
end
67-
6863
desc 'Include the build number in the version string'
6964
lane :set_version do |options|
7065
version = options[:version] || current_bundle_version
@@ -84,7 +79,7 @@
8479
create_keychain(name: keychain,
8580
password: password,
8681
timeout: 3600)
87-
82+
8883
# Set up code signing correctly
8984
# (more information: https://codesigning.guide)
9085
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
C05E29F9598A4CA284DE922A /* libRCTRestart.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14483BC863F7489F8369E21B /* libRCTRestart.a */; };
@@ -265,13 +264,6 @@
265264
remoteGlobalIDString = 134814201AA4EA6300B7C361;
266265
remoteInfo = RNSearchBar;
267266
};
268-
00D67CC91E5005DF00379DD7 /* PBXContainerItemProxy */ = {
269-
isa = PBXContainerItemProxy;
270-
containerPortal = AECB3DDD098E445D8AB3555F /* CodePush.xcodeproj */;
271-
proxyType = 2;
272-
remoteGlobalIDString = 134814201AA4EA6300B7C361;
273-
remoteInfo = CodePush;
274-
};
275267
00DE0C341E7C3087005F3CE3 /* PBXContainerItemProxy */ = {
276268
isa = PBXContainerItemProxy;
277269
containerPortal = 59C781128E0B476A8826CD12 /* BugsnagReactNative.xcodeproj */;
@@ -401,7 +393,6 @@
401393
9C476D4877F945308C96FF0F /* libRNNetworkInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNNetworkInfo.a; sourceTree = "<group>"; };
402394
A2D51A8982104BF29657933B /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = "<group>"; };
403395
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>"; };
404-
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>"; };
405396
B4920CEFDAA947C8B63B7C8B /* libBugsnagReactNative.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBugsnagReactNative.a; sourceTree = "<group>"; };
406397
BC36B827687E41ADA029DA16 /* libRNSearchBar.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSearchBar.a; sourceTree = "<group>"; };
407398
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>"; };
@@ -413,7 +404,6 @@
413404
DBE3B3C3883845C787D391C2 /* RCTRestart.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTRestart.xcodeproj; path = "../node_modules/react-native-restart/ios/RCTRestart.xcodeproj"; sourceTree = "<group>"; };
414405
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>"; };
415406
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>"; };
416-
E90E6CCE2A464D80BE6D83B2 /* libCodePush.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libCodePush.a; sourceTree = "<group>"; };
417407
F803FE6585F04E9F8D3C053F /* libRCTGoogleAnalyticsBridge.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTGoogleAnalyticsBridge.a; sourceTree = "<group>"; };
418408
/* End PBXFileReference section */
419409

@@ -449,7 +439,6 @@
449439
1848577634C04472802C4F91 /* libRCTGoogleAnalyticsBridge.a in Frameworks */,
450440
37755BD2F66641FB97979B7E /* libRCTOneSignal.a in Frameworks */,
451441
24C1AB28D1424CD095CB8582 /* libRNKeychain.a in Frameworks */,
452-
A3D56267BEA24AB583A6D2A2 /* libCodePush.a in Frameworks */,
453442
56DC65C1BF07427AA1F84CFC /* libSafariViewManager.a in Frameworks */,
454443
A90299E6C1BD45C385BBF8F0 /* libDBCustomTabs.a in Frameworks */,
455444
570ACE6B68F941838FFABAA9 /* libRNViewShot.a in Frameworks */,
@@ -614,14 +603,6 @@
614603
name = Products;
615604
sourceTree = "<group>";
616605
};
617-
00D67CC61E5005DF00379DD7 /* Products */ = {
618-
isa = PBXGroup;
619-
children = (
620-
00D67CCA1E5005DF00379DD7 /* libCodePush.a */,
621-
);
622-
name = Products;
623-
sourceTree = "<group>";
624-
};
625606
00DE0C311E7C3087005F3CE3 /* Products */ = {
626607
isa = PBXGroup;
627608
children = (
@@ -746,7 +727,6 @@
746727
36AB9BDB6CF1449E997C6D74 /* AirMaps.xcodeproj */,
747728
59C781128E0B476A8826CD12 /* BugsnagReactNative.xcodeproj */,
748729
C1122D5F37D247E09037EE31 /* BVLinearGradient.xcodeproj */,
749-
AECB3DDD098E445D8AB3555F /* CodePush.xcodeproj */,
750730
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
751731
3A0CEA711DEA20340036E739 /* RCTAnimation.xcodeproj */,
752732
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
@@ -899,10 +879,6 @@
899879
ProductGroup = 00CF91E61E770EF900DD9CBC /* Products */;
900880
ProjectRef = C1122D5F37D247E09037EE31 /* BVLinearGradient.xcodeproj */;
901881
},
902-
{
903-
ProductGroup = 00D67CC61E5005DF00379DD7 /* Products */;
904-
ProjectRef = AECB3DDD098E445D8AB3555F /* CodePush.xcodeproj */;
905-
},
906882
{
907883
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
908884
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
@@ -1219,13 +1195,6 @@
12191195
remoteRef = 00D4C3481EB97C9900733278 /* PBXContainerItemProxy */;
12201196
sourceTree = BUILT_PRODUCTS_DIR;
12211197
};
1222-
00D67CCA1E5005DF00379DD7 /* libCodePush.a */ = {
1223-
isa = PBXReferenceProxy;
1224-
fileType = archive.ar;
1225-
path = libCodePush.a;
1226-
remoteRef = 00D67CC91E5005DF00379DD7 /* PBXContainerItemProxy */;
1227-
sourceTree = BUILT_PRODUCTS_DIR;
1228-
};
12291198
00DE0C351E7C3087005F3CE3 /* libBugsnagReactNative.a */ = {
12301199
isa = PBXReferenceProxy;
12311200
fileType = archive.ar;
@@ -1454,7 +1423,6 @@
14541423
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
14551424
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
14561425
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1457-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
14581426
"$(SRCROOT)/../node_modules/react-native-safari-view",
14591427
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
14601428
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
@@ -1501,7 +1469,6 @@
15011469
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
15021470
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
15031471
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1504-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
15051472
"$(SRCROOT)/../node_modules/react-native-safari-view",
15061473
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
15071474
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
@@ -1576,7 +1543,6 @@
15761543
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
15771544
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
15781545
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1579-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
15801546
"$(SRCROOT)/../node_modules/react-native-safari-view",
15811547
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
15821548
);
@@ -1629,7 +1595,6 @@
16291595
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
16301596
"$(SRCROOT)/../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/**",
16311597
"$(SRCROOT)/../node_modules/react-native-onesignal/ios/**",
1632-
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
16331598
"$(SRCROOT)/../node_modules/react-native-safari-view",
16341599
"$(SRCROOT)/../node_modules/react-native-custom-tabs/ios/ReactNativeCustomTabs",
16351600
);

‎ios/AllAboutOlaf/AppDelegate.m‎

Lines changed: 1 addition & 7 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
28-
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios"
26+
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)