Skip to content

Commit c12a208

Browse files
Mookiiesreime005
andauthored
fix: CI & migrate to mavenCentral (#249)
* Bump joschi/setup-jdk to v2 to fix android ci * Swap to mavenCentral due to jcenter shutting down https://developer.android.com/studio/build/jcenter-migration * chore: fix ci ios Co-authored-by: Marius Reimer <[email protected]>
1 parent 79daec9 commit c12a208

File tree

7 files changed

+7
-134
lines changed

7 files changed

+7
-134
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
node-version: 12
1818

1919
- name: Use specific Java version for sdkmanager to work
20-
uses: joschi/setup-jdk@v1
20+
uses: joschi/setup-jdk@v2
2121
with:
2222
java-version: 'openjdk8'
2323
architecture: 'x64'

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
ext.detoxKotlinVersion = ext.kotlinVersion
1010

1111
repositories {
12-
jcenter()
12+
mavenCentral()
1313
google()
1414
}
1515
dependencies {

example/RNBackgroundExample/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212
repositories {
1313
google()
14-
jcenter()
14+
mavenCentral()
1515
}
1616
dependencies {
1717
classpath("com.android.tools.build:gradle:3.5.3")

example/RNBackgroundExample/ios/Podfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@ target 'RNBackgroundExample' do
1212
inherit! :complete
1313
# Pods for testing
1414
end
15-
16-
# Enables Flipper.
17-
#
18-
# Note that if you have use_frameworks! enabled, Flipper will not work and
19-
# you should disable these next few lines.
20-
use_flipper!
21-
post_install do |installer|
22-
flipper_post_install(installer)
23-
end
2415
end
2516

2617
target 'RNBackgroundExample-tvOS' do

example/RNBackgroundExample/ios/Podfile.lock

Lines changed: 4 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
PODS:
22
- boost-for-react-native (1.63.0)
3-
- CocoaAsyncSocket (7.6.4)
4-
- CocoaLibEvent (1.0.0)
53
- DoubleConversion (1.1.6)
64
- FBLazyVector (0.63.2)
75
- FBReactNativeSpec (0.63.2):
@@ -11,52 +9,6 @@ PODS:
119
- React-Core (= 0.63.2)
1210
- React-jsi (= 0.63.2)
1311
- ReactCommon/turbomodule/core (= 0.63.2)
14-
- Flipper (0.41.5):
15-
- Flipper-Folly (~> 2.2)
16-
- Flipper-RSocket (~> 1.1)
17-
- Flipper-DoubleConversion (1.1.7)
18-
- Flipper-Folly (2.2.0):
19-
- boost-for-react-native
20-
- CocoaLibEvent (~> 1.0)
21-
- Flipper-DoubleConversion
22-
- Flipper-Glog
23-
- OpenSSL-Universal (= 1.0.2.19)
24-
- Flipper-Glog (0.3.6)
25-
- Flipper-PeerTalk (0.0.4)
26-
- Flipper-RSocket (1.1.0):
27-
- Flipper-Folly (~> 2.2)
28-
- FlipperKit (0.41.5):
29-
- FlipperKit/Core (= 0.41.5)
30-
- FlipperKit/Core (0.41.5):
31-
- Flipper (~> 0.41.5)
32-
- FlipperKit/CppBridge
33-
- FlipperKit/FBCxxFollyDynamicConvert
34-
- FlipperKit/FBDefines
35-
- FlipperKit/FKPortForwarding
36-
- FlipperKit/CppBridge (0.41.5):
37-
- Flipper (~> 0.41.5)
38-
- FlipperKit/FBCxxFollyDynamicConvert (0.41.5):
39-
- Flipper-Folly (~> 2.2)
40-
- FlipperKit/FBDefines (0.41.5)
41-
- FlipperKit/FKPortForwarding (0.41.5):
42-
- CocoaAsyncSocket (~> 7.6)
43-
- Flipper-PeerTalk (~> 0.0.4)
44-
- FlipperKit/FlipperKitHighlightOverlay (0.41.5)
45-
- FlipperKit/FlipperKitLayoutPlugin (0.41.5):
46-
- FlipperKit/Core
47-
- FlipperKit/FlipperKitHighlightOverlay
48-
- FlipperKit/FlipperKitLayoutTextSearchable
49-
- YogaKit (~> 1.18)
50-
- FlipperKit/FlipperKitLayoutTextSearchable (0.41.5)
51-
- FlipperKit/FlipperKitNetworkPlugin (0.41.5):
52-
- FlipperKit/Core
53-
- FlipperKit/FlipperKitReactPlugin (0.41.5):
54-
- FlipperKit/Core
55-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5):
56-
- FlipperKit/Core
57-
- FlipperKit/SKIOSNetworkPlugin (0.41.5):
58-
- FlipperKit/Core
59-
- FlipperKit/FlipperKitNetworkPlugin
6012
- Folly (2020.01.13.00):
6113
- boost-for-react-native
6214
- DoubleConversion
@@ -67,9 +19,6 @@ PODS:
6719
- DoubleConversion
6820
- glog
6921
- glog (0.3.5)
70-
- OpenSSL-Universal (1.0.2.19):
71-
- OpenSSL-Universal/Static (= 1.0.2.19)
72-
- OpenSSL-Universal/Static (1.0.2.19)
7322
- RCTRequired (0.63.2)
7423
- RCTTypeSafety (0.63.2):
7524
- FBLazyVector (= 0.63.2)
@@ -236,7 +185,7 @@ PODS:
236185
- React-cxxreact (= 0.63.2)
237186
- React-jsi (= 0.63.2)
238187
- React-jsinspector (0.63.2)
239-
- react-native-background-upload (6.0.0):
188+
- react-native-background-upload (6.2.0):
240189
- React
241190
- react-native-image-picker (1.1.0):
242191
- React
@@ -303,32 +252,11 @@ PODS:
303252
- RNFS (2.16.1):
304253
- React
305254
- Yoga (1.14.0)
306-
- YogaKit (1.18.1):
307-
- Yoga (~> 1.14)
308255

309256
DEPENDENCIES:
310257
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
311258
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
312259
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
313-
- Flipper (~> 0.41.1)
314-
- Flipper-DoubleConversion (= 1.1.7)
315-
- Flipper-Folly (~> 2.2)
316-
- Flipper-Glog (= 0.3.6)
317-
- Flipper-PeerTalk (~> 0.0.4)
318-
- Flipper-RSocket (~> 1.1)
319-
- FlipperKit (~> 0.41.1)
320-
- FlipperKit/Core (~> 0.41.1)
321-
- FlipperKit/CppBridge (~> 0.41.1)
322-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.41.1)
323-
- FlipperKit/FBDefines (~> 0.41.1)
324-
- FlipperKit/FKPortForwarding (~> 0.41.1)
325-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.41.1)
326-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.41.1)
327-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.41.1)
328-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.41.1)
329-
- FlipperKit/FlipperKitReactPlugin (~> 0.41.1)
330-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1)
331-
- FlipperKit/SKIOSNetworkPlugin (~> 0.41.1)
332260
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
333261
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
334262
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -361,17 +289,6 @@ DEPENDENCIES:
361289
SPEC REPOS:
362290
trunk:
363291
- boost-for-react-native
364-
- CocoaAsyncSocket
365-
- CocoaLibEvent
366-
- Flipper
367-
- Flipper-DoubleConversion
368-
- Flipper-Folly
369-
- Flipper-Glog
370-
- Flipper-PeerTalk
371-
- Flipper-RSocket
372-
- FlipperKit
373-
- OpenSSL-Universal
374-
- YogaKit
375292

376293
EXTERNAL SOURCES:
377294
DoubleConversion:
@@ -435,21 +352,11 @@ EXTERNAL SOURCES:
435352

436353
SPEC CHECKSUMS:
437354
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
438-
CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
439-
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
440355
DoubleConversion: cde416483dac037923206447da6e1454df403714
441356
FBLazyVector: 3ef4a7f62e7db01092f9d517d2ebc0d0677c4a37
442357
FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a
443-
Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13
444-
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
445-
Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
446-
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
447-
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
448-
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
449-
FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83
450358
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
451359
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
452-
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
453360
RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe
454361
RCTTypeSafety: 44982c5c8e43ff4141eb519a8ddc88059acd1f3a
455362
React: e1c65dd41cb9db13b99f24608e47dd595f28ca9a
@@ -460,7 +367,7 @@ SPEC CHECKSUMS:
460367
React-jsi: 54245e1d5f4b690dec614a73a3795964eeef13a8
461368
React-jsiexecutor: 8ca588cc921e70590820ce72b8789b02c67cce38
462369
React-jsinspector: b14e62ebe7a66e9231e9581279909f2fc3db6606
463-
react-native-background-upload: 32c279ee62c6dc6c8aeb5727b0c56cfc797ef9bc
370+
react-native-background-upload: 2c64e040ba7be05c2a39cfe82fc308b404b33318
464371
react-native-image-picker: 7a85cf7b0a53845f03ae52fb4592a2748ded069b
465372
React-RCTActionSheet: 910163b6b09685a35c4ebbc52b66d1bfbbe39fc5
466373
React-RCTAnimation: 9a883bbe1e9d2e158d4fb53765ed64c8dc2200c6
@@ -474,8 +381,7 @@ SPEC CHECKSUMS:
474381
ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce
475382
RNFS: 795866388a01de4e470f3b1041a99cf20a343844
476383
Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
477-
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
478384

479-
PODFILE CHECKSUM: 3dbe547d869bf028eb345564fe18f3e80d5e9f76
385+
PODFILE CHECKSUM: 98cf361193bf0795e3fb8428001334eaafe624d2
480386

481-
COCOAPODS: 1.9.3
387+
COCOAPODS: 1.10.1

example/RNBackgroundExample/ios/RNBackgroundExample/AppDelegate.m

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,10 @@
1111
#import <React/RCTBundleURLProvider.h>
1212
#import <React/RCTRootView.h>
1313

14-
#ifdef FB_SONARKIT_ENABLED
15-
#import <FlipperKit/FlipperClient.h>
16-
#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
17-
#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
18-
#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
19-
#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
20-
#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
21-
22-
static void InitializeFlipper(UIApplication *application) {
23-
FlipperClient *client = [FlipperClient sharedClient];
24-
SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
25-
[client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
26-
[client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
27-
[client addPlugin:[FlipperKitReactPlugin new]];
28-
[client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
29-
[client start];
30-
}
31-
#endif
32-
3314
@implementation AppDelegate
3415

3516
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
3617
{
37-
#ifdef FB_SONARKIT_ENABLED
38-
InitializeFlipper(application);
39-
#endif
40-
4118
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
4219
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
4320
moduleName:@"RNBackgroundExample"

example/RNBackgroundExample/scripts/deploy-ios.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ xcodebuild \
77
-scheme 'RNBackgroundExample' \
88
-configuration $1 \
99
-sdk iphonesimulator \
10-
-UseModernBuildSystem=NO \
1110
-derivedDataPath ios/build \
1211
-quiet

0 commit comments

Comments
 (0)