From 78e8e47ad783703977435c64cf909e9fa9565ab7 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 23 Dec 2019 16:48:21 +0800 Subject: [PATCH] Feature/master fix path error (#3) * fix:fix minimum example version * fix:add target version in example podfile * fix:change example js source path --- doric-iOS/Example/Example.xcodeproj/project.pbxproj | 6 ++++-- doric-iOS/Example/Podfile | 2 +- doric-iOS/Pod/Classes/Engine/DoricJSEngine.m | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doric-iOS/Example/Example.xcodeproj/project.pbxproj b/doric-iOS/Example/Example.xcodeproj/project.pbxproj index 62242b3a..b2762de1 100644 --- a/doric-iOS/Example/Example.xcodeproj/project.pbxproj +++ b/doric-iOS/Example/Example.xcodeproj/project.pbxproj @@ -541,7 +541,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -594,7 +594,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -610,6 +610,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 7EE2RX3L3P; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -628,6 +629,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 7EE2RX3L3P; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/doric-iOS/Example/Podfile b/doric-iOS/Example/Podfile index fc9bb631..d74fcf40 100644 --- a/doric-iOS/Example/Podfile +++ b/doric-iOS/Example/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' + platform :ios, '10.0' target 'Example' do diff --git a/doric-iOS/Pod/Classes/Engine/DoricJSEngine.m b/doric-iOS/Pod/Classes/Engine/DoricJSEngine.m index 532701aa..3484230a 100644 --- a/doric-iOS/Pod/Classes/Engine/DoricJSEngine.m +++ b/doric-iOS/Pod/Classes/Engine/DoricJSEngine.m @@ -115,14 +115,14 @@ - (void)initJSExecutor { - (void)initDoricEnvironment { [self loadBuiltinJS:DORIC_BUNDLE_SANDBOX]; - NSString *path = [DoricBundle() pathForResource:DORIC_BUNDLE_LIB ofType:@"js" inDirectory:@"bundle"]; + NSString *path = [DoricBundle() pathForResource:DORIC_BUNDLE_LIB ofType:@"js"]; NSString *jsContent = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil]; [self.jsExecutor loadJSScript:[self packageModuleScript:DORIC_MODULE_LIB content:jsContent] source:[@"Module://" stringByAppendingString:DORIC_MODULE_LIB]]; } - (void)loadBuiltinJS:(NSString *)fileName { - NSString *path = [DoricBundle() pathForResource:DORIC_BUNDLE_SANDBOX ofType:@"js" inDirectory:@"bundle"]; + NSString *path = [DoricBundle() pathForResource:DORIC_BUNDLE_SANDBOX ofType:@"js"]; NSString *jsContent = [NSString stringWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil]; [self.jsExecutor loadJSScript:jsContent source:[@"Assets://" stringByAppendingString:fileName]]; }