From c12a2085bdbc6f95185cf195f8fdad7285573408 Mon Sep 17 00:00:00 2001 From: Malcolm Date: Wed, 5 May 2021 11:14:03 -0700 Subject: [PATCH] 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 --- .github/workflows/android.yml | 2 +- android/build.gradle | 2 +- .../RNBackgroundExample/android/build.gradle | 2 +- example/RNBackgroundExample/ios/Podfile | 9 -- example/RNBackgroundExample/ios/Podfile.lock | 102 +----------------- .../ios/RNBackgroundExample/AppDelegate.m | 23 ---- .../RNBackgroundExample/scripts/deploy-ios.sh | 1 - 7 files changed, 7 insertions(+), 134 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index de1a7d58..992ed83f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -17,7 +17,7 @@ jobs: node-version: 12 - name: Use specific Java version for sdkmanager to work - uses: joschi/setup-jdk@v1 + uses: joschi/setup-jdk@v2 with: java-version: 'openjdk8' architecture: 'x64' diff --git a/android/build.gradle b/android/build.gradle index bb9c3ab1..74220397 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { ext.detoxKotlinVersion = ext.kotlinVersion repositories { - jcenter() + mavenCentral() google() } dependencies { diff --git a/example/RNBackgroundExample/android/build.gradle b/example/RNBackgroundExample/android/build.gradle index 317af855..35b5c37d 100644 --- a/example/RNBackgroundExample/android/build.gradle +++ b/example/RNBackgroundExample/android/build.gradle @@ -11,7 +11,7 @@ buildscript { } repositories { google() - jcenter() + mavenCentral() } dependencies { classpath("com.android.tools.build:gradle:3.5.3") diff --git a/example/RNBackgroundExample/ios/Podfile b/example/RNBackgroundExample/ios/Podfile index 378a8f74..93cca004 100644 --- a/example/RNBackgroundExample/ios/Podfile +++ b/example/RNBackgroundExample/ios/Podfile @@ -12,15 +12,6 @@ target 'RNBackgroundExample' do inherit! :complete # Pods for testing end - - # Enables Flipper. - # - # Note that if you have use_frameworks! enabled, Flipper will not work and - # you should disable these next few lines. - use_flipper! - post_install do |installer| - flipper_post_install(installer) - end end target 'RNBackgroundExample-tvOS' do diff --git a/example/RNBackgroundExample/ios/Podfile.lock b/example/RNBackgroundExample/ios/Podfile.lock index e4a1b9f8..4cf74607 100644 --- a/example/RNBackgroundExample/ios/Podfile.lock +++ b/example/RNBackgroundExample/ios/Podfile.lock @@ -1,7 +1,5 @@ PODS: - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.4) - - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.6) - FBLazyVector (0.63.2) - FBReactNativeSpec (0.63.2): @@ -11,52 +9,6 @@ PODS: - React-Core (= 0.63.2) - React-jsi (= 0.63.2) - ReactCommon/turbomodule/core (= 0.63.2) - - Flipper (0.41.5): - - Flipper-Folly (~> 2.2) - - Flipper-RSocket (~> 1.1) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.2.0): - - boost-for-react-native - - CocoaLibEvent (~> 1.0) - - Flipper-DoubleConversion - - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) - - Flipper-Glog (0.3.6) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.1.0): - - Flipper-Folly (~> 2.2) - - FlipperKit (0.41.5): - - FlipperKit/Core (= 0.41.5) - - FlipperKit/Core (0.41.5): - - Flipper (~> 0.41.5) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.41.5): - - Flipper (~> 0.41.5) - - FlipperKit/FBCxxFollyDynamicConvert (0.41.5): - - Flipper-Folly (~> 2.2) - - FlipperKit/FBDefines (0.41.5) - - FlipperKit/FKPortForwarding (0.41.5): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.41.5) - - FlipperKit/FlipperKitLayoutPlugin (0.41.5): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.41.5) - - FlipperKit/FlipperKitNetworkPlugin (0.41.5): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.41.5): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.41.5): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -67,9 +19,6 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) - RCTRequired (0.63.2) - RCTTypeSafety (0.63.2): - FBLazyVector (= 0.63.2) @@ -236,7 +185,7 @@ PODS: - React-cxxreact (= 0.63.2) - React-jsi (= 0.63.2) - React-jsinspector (0.63.2) - - react-native-background-upload (6.0.0): + - react-native-background-upload (6.2.0): - React - react-native-image-picker (1.1.0): - React @@ -303,32 +252,11 @@ PODS: - RNFS (2.16.1): - React - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Flipper (~> 0.41.1) - - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.2) - - Flipper-Glog (= 0.3.6) - - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.1) - - FlipperKit (~> 0.41.1) - - FlipperKit/Core (~> 0.41.1) - - FlipperKit/CppBridge (~> 0.41.1) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.41.1) - - FlipperKit/FBDefines (~> 0.41.1) - - FlipperKit/FKPortForwarding (~> 0.41.1) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.41.1) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.41.1) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.41.1) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.41.1) - - FlipperKit/FlipperKitReactPlugin (~> 0.41.1) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1) - - FlipperKit/SKIOSNetworkPlugin (~> 0.41.1) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -361,17 +289,6 @@ DEPENDENCIES: SPEC REPOS: trunk: - boost-for-react-native - - CocoaAsyncSocket - - CocoaLibEvent - - Flipper - - Flipper-DoubleConversion - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - - OpenSSL-Universal - - YogaKit EXTERNAL SOURCES: DoubleConversion: @@ -435,21 +352,11 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 - CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: 3ef4a7f62e7db01092f9d517d2ebc0d0677c4a37 FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a - Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13 - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83 Folly: b73c3869541e86821df3c387eb0af5f65addfab4 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe RCTTypeSafety: 44982c5c8e43ff4141eb519a8ddc88059acd1f3a React: e1c65dd41cb9db13b99f24608e47dd595f28ca9a @@ -460,7 +367,7 @@ SPEC CHECKSUMS: React-jsi: 54245e1d5f4b690dec614a73a3795964eeef13a8 React-jsiexecutor: 8ca588cc921e70590820ce72b8789b02c67cce38 React-jsinspector: b14e62ebe7a66e9231e9581279909f2fc3db6606 - react-native-background-upload: 32c279ee62c6dc6c8aeb5727b0c56cfc797ef9bc + react-native-background-upload: 2c64e040ba7be05c2a39cfe82fc308b404b33318 react-native-image-picker: 7a85cf7b0a53845f03ae52fb4592a2748ded069b React-RCTActionSheet: 910163b6b09685a35c4ebbc52b66d1bfbbe39fc5 React-RCTAnimation: 9a883bbe1e9d2e158d4fb53765ed64c8dc2200c6 @@ -474,8 +381,7 @@ SPEC CHECKSUMS: ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce RNFS: 795866388a01de4e470f3b1041a99cf20a343844 Yoga: 7740b94929bbacbddda59bf115b5317e9a161598 - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 3dbe547d869bf028eb345564fe18f3e80d5e9f76 +PODFILE CHECKSUM: 98cf361193bf0795e3fb8428001334eaafe624d2 -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.1 diff --git a/example/RNBackgroundExample/ios/RNBackgroundExample/AppDelegate.m b/example/RNBackgroundExample/ios/RNBackgroundExample/AppDelegate.m index 126c85a8..7034d062 100644 --- a/example/RNBackgroundExample/ios/RNBackgroundExample/AppDelegate.m +++ b/example/RNBackgroundExample/ios/RNBackgroundExample/AppDelegate.m @@ -11,33 +11,10 @@ #import #import -#ifdef FB_SONARKIT_ENABLED -#import -#import -#import -#import -#import -#import - -static void InitializeFlipper(UIApplication *application) { - FlipperClient *client = [FlipperClient sharedClient]; - SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults]; - [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]]; - [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]]; - [client addPlugin:[FlipperKitReactPlugin new]]; - [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]]; - [client start]; -} -#endif - @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - #ifdef FB_SONARKIT_ENABLED - InitializeFlipper(application); - #endif - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"RNBackgroundExample" diff --git a/example/RNBackgroundExample/scripts/deploy-ios.sh b/example/RNBackgroundExample/scripts/deploy-ios.sh index 77bc0d16..ecf00849 100644 --- a/example/RNBackgroundExample/scripts/deploy-ios.sh +++ b/example/RNBackgroundExample/scripts/deploy-ios.sh @@ -7,6 +7,5 @@ xcodebuild \ -scheme 'RNBackgroundExample' \ -configuration $1 \ -sdk iphonesimulator \ - -UseModernBuildSystem=NO \ -derivedDataPath ios/build \ -quiet