From da78b0ff5137f62c9384d35af3de9e26365182a9 Mon Sep 17 00:00:00 2001 From: Taron K Date: Thu, 9 Jul 2020 13:49:01 +0400 Subject: [PATCH 1/3] - Updated Header Search Paths for iOS to work with React pod project. --- .../RCTSplashScreen.xcodeproj/project.pbxproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj b/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj index be5fa3b..0da91e5 100644 --- a/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj +++ b/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj @@ -105,6 +105,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 9F90C21B1D619E9400F3E238; @@ -217,7 +218,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../../react-native/React/**", + "$(SRCROOT)/../../../../ios/Pods/Headers/Public/React-Core\"/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -231,7 +232,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../../react-native/React/**", + "$(SRCROOT)/../../../../ios/Pods/Headers/Public/React-Core\"/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; From 24b96a5eaabcb83c8cafbe731fe7057f5dda3c47 Mon Sep 17 00:00:00 2001 From: Taron K Date: Thu, 9 Jul 2020 16:42:07 +0400 Subject: [PATCH 2/3] - Added overriding for requiresMainQueueSetup method. --- .../RCTSplashScreen.xcodeproj/project.pbxproj | 4 ++-- ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj b/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj index 0da91e5..4a1f421 100644 --- a/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj +++ b/ios/RCTSplashScreen/RCTSplashScreen.xcodeproj/project.pbxproj @@ -218,7 +218,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../../../ios/Pods/Headers/Public/React-Core\"/**", + "$(SRCROOT)/../../../../ios/Pods/Headers/Public/React-Core/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -232,7 +232,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../../../ios/Pods/Headers/Public/React-Core\"/**", + "$(SRCROOT)/../../../../ios/Pods/Headers/Public/React-Core/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m b/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m index 278fefd..b996e3f 100644 --- a/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m +++ b/ios/RCTSplashScreen/RCTSplashScreen/RCTSplashScreen.m @@ -92,4 +92,10 @@ - (NSDictionary *)constantsToExport }; } ++ (BOOL)requiresMainQueueSetup +{ + return YES; +} + @end + From a882ca53fb51d29aa1ff27b515957f4d5ff4f148 Mon Sep 17 00:00:00 2001 From: arthur-ag <70795785+arthur-ag@users.noreply.github.com> Date: Wed, 6 Jul 2022 10:27:12 +0400 Subject: [PATCH 3/3] Update build.gradle --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index dfbd150..5a7ec75 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -19,7 +19,7 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.facebook.react:react-native:+' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:23.4.0' + implementation 'com.facebook.react:react-native:+' }