diff --git a/Doric.podspec b/Doric.podspec index ae7118a7..e1fdb40a 100644 --- a/Doric.podspec +++ b/Doric.podspec @@ -16,7 +16,6 @@ Doric iOS SDK s.ios.deployment_target = '8.0' s.source_files = 'Pod/Classes/**/*' - s.resource = "Pod/Assets/*.js" s.resource_bundles = { 'Doric' => ['Pod/Assets/**/*'] } diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 30a17906..d39b1805 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -7,9 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 1B5560FDC1A57040A84A35AB /* libPods-ExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 30CF3CCBAF1F8AD594763E4A /* libPods-ExampleTests.a */; }; - 2EB14575543B0285648B858D /* libPods-Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3CFA4394FF1344386170022 /* libPods-Example.a */; }; - 835F4CD080BABFE95A6BFD16 /* libPods-ExampleUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 563C5AC823878F4913BBCDF2 /* libPods-ExampleUITests.a */; }; + 26047AF7D618FF60281DC778 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92C4B99C431BD381198935DE /* Pods_Example.framework */; }; + C6AF7EB0B40D76A46B2BB384 /* Pods_ExampleUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF50786B1D1793EC3228133B /* Pods_ExampleUITests.framework */; }; D751D4B065D8D4FA6594B5EE /* DemoVC.m in Sources */ = {isa = PBXBuildFile; fileRef = D751D19E97EF4EDD7588FEBE /* DemoVC.m */; }; D751D4FCC0A2322211DE3D55 /* QRScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D751DA399F1ADB6D34563B5D /* QRScanViewController.m */; }; E2334AF022E9D2060098A085 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E2334AEF22E9D2060098A085 /* AppDelegate.m */; }; @@ -21,6 +20,7 @@ E2334B0822E9D2070098A085 /* ExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2334B0722E9D2070098A085 /* ExampleTests.m */; }; E2334B1322E9D2070098A085 /* ExampleUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = E2334B1222E9D2070098A085 /* ExampleUITests.m */; }; E2F4481723839AC500073C7F /* demo in Resources */ = {isa = PBXBuildFile; fileRef = E2F4481623839AC500073C7F /* demo */; }; + E778063CA90E2DD797D11D7C /* Pods_ExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00A2FF6380A526AB267988ED /* Pods_ExampleTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -41,14 +41,14 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 00A2FF6380A526AB267988ED /* Pods_ExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 016E930415B91D826F9FFF47 /* Pods-ExampleUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ExampleUITests/Pods-ExampleUITests.debug.xcconfig"; sourceTree = ""; }; - 30CF3CCBAF1F8AD594763E4A /* libPods-ExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3D75F592D76A665674B31A66 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = ""; }; - 563C5AC823878F4913BBCDF2 /* libPods-ExampleUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 8231E841CCAF382F85C9F576 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = ""; }; + 92C4B99C431BD381198935DE /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B93423722F2E06DC238CDD18 /* Pods-ExampleUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ExampleUITests/Pods-ExampleUITests.release.xcconfig"; sourceTree = ""; }; B93D4DB00FD244178B7CE7C4 /* Pods-ExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ExampleTests/Pods-ExampleTests.release.xcconfig"; sourceTree = ""; }; - C3CFA4394FF1344386170022 /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + BF50786B1D1793EC3228133B /* Pods_ExampleUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D751D18AD6496F4A9BE1AB45 /* QRScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QRScanViewController.h; sourceTree = ""; }; D751D19E97EF4EDD7588FEBE /* DemoVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoVC.m; sourceTree = ""; }; D751DA399F1ADB6D34563B5D /* QRScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QRScanViewController.m; sourceTree = ""; }; @@ -78,7 +78,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2EB14575543B0285648B858D /* libPods-Example.a in Frameworks */, + 26047AF7D618FF60281DC778 /* Pods_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -86,7 +86,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1B5560FDC1A57040A84A35AB /* libPods-ExampleTests.a in Frameworks */, + E778063CA90E2DD797D11D7C /* Pods_ExampleTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -94,7 +94,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 835F4CD080BABFE95A6BFD16 /* libPods-ExampleUITests.a in Frameworks */, + C6AF7EB0B40D76A46B2BB384 /* Pods_ExampleUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -117,9 +117,9 @@ D80A9B07B39AD04027CAE17B /* Frameworks */ = { isa = PBXGroup; children = ( - C3CFA4394FF1344386170022 /* libPods-Example.a */, - 30CF3CCBAF1F8AD594763E4A /* libPods-ExampleTests.a */, - 563C5AC823878F4913BBCDF2 /* libPods-ExampleUITests.a */, + 92C4B99C431BD381198935DE /* Pods_Example.framework */, + 00A2FF6380A526AB267988ED /* Pods_ExampleTests.framework */, + BF50786B1D1793EC3228133B /* Pods_ExampleUITests.framework */, ); name = Frameworks; sourceTree = ""; @@ -197,7 +197,7 @@ E2334AE722E9D2060098A085 /* Sources */, E2334AE822E9D2060098A085 /* Frameworks */, E2334AE922E9D2060098A085 /* Resources */, - C232600D894D85358A6ABF4D /* [CP] Copy Pods Resources */, + 223E53E328880489770F8C93 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -339,6 +339,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 223E53E328880489770F8C93 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 48D050F720D3A879060292A8 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -383,23 +400,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - C232600D894D85358A6ABF4D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; E24A030C22EED0D500AB4631 /* Package JS Bundle */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/Example/DemoVC.m b/Example/Example/DemoVC.m index 02f7f354..bc3e8b9e 100644 --- a/Example/Example/DemoVC.m +++ b/Example/Example/DemoVC.m @@ -4,7 +4,7 @@ // #import "DemoVC.h" -#import "Doric.h" +#import @interface DemoVC () @property(nonatomic, copy) NSString *filePath; @@ -36,4 +36,4 @@ - (void)viewDidLoad { [panel config:jsContent alias:self.filePath]; } -@end \ No newline at end of file +@end diff --git a/Example/Example/QRScanViewController.m b/Example/Example/QRScanViewController.m index 81aa3292..d963fb69 100644 --- a/Example/Example/QRScanViewController.m +++ b/Example/Example/QRScanViewController.m @@ -5,7 +5,7 @@ #import "QRScanViewController.h" #import -#import "Doric.h" +#import @interface QRScanViewController () @property(strong, nonatomic) AVCaptureDevice *device; @@ -90,4 +90,4 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects: [self.navigationController popViewControllerAnimated:NO]; } } -@end \ No newline at end of file +@end diff --git a/Example/Example/ViewController.m b/Example/Example/ViewController.m index 43bf753d..59a11e8a 100644 --- a/Example/Example/ViewController.m +++ b/Example/Example/ViewController.m @@ -7,7 +7,7 @@ // #import "ViewController.h" -#import "Doric.h" +#import #import "DemoVC.h" #import "QRScanViewController.h" diff --git a/Example/Podfile b/Example/Podfile index 86f37ee2..2aa6129a 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -2,8 +2,8 @@ # platform :ios, '9.0' target 'Example' do - - pod 'Doric', :path => '../' + use_frameworks! + pod 'Doric', :path => '../../doric-iOS' target 'ExampleTests' do inherit! :search_paths # Pods for testing diff --git a/Pod/Classes/NavBar/DoricNavBarDelegate.h b/Pod/Classes/NavBar/DoricNavBarDelegate.h index ad668f5e..bb9745b9 100644 --- a/Pod/Classes/NavBar/DoricNavBarDelegate.h +++ b/Pod/Classes/NavBar/DoricNavBarDelegate.h @@ -18,7 +18,7 @@ // #import - +#import @protocol DoricNavBarDelegate - (BOOL)doric_navBar_isHidden; @@ -28,4 +28,4 @@ - (void)doric_navBar_setTitle:(NSString *)title; - (void)doric_navBar_setBackgroundColor:(UIColor *)color; -@end \ No newline at end of file +@end diff --git a/Pod/Classes/Navigator/DoricNavigatorDelegate.h b/Pod/Classes/Navigator/DoricNavigatorDelegate.h index 52d4d315..93f23eb8 100644 --- a/Pod/Classes/Navigator/DoricNavigatorDelegate.h +++ b/Pod/Classes/Navigator/DoricNavigatorDelegate.h @@ -23,4 +23,4 @@ - (void)doric_navigator_push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated; - (void)doric_navigator_pop:(BOOL)animated; -@end \ No newline at end of file +@end diff --git a/Pod/Classes/Shader/DoricLayouts.h b/Pod/Classes/Shader/DoricLayouts.h index 4e859b78..6bbf858d 100644 --- a/Pod/Classes/Shader/DoricLayouts.h +++ b/Pod/Classes/Shader/DoricLayouts.h @@ -18,6 +18,8 @@ // #import +#import +#import typedef UIEdgeInsets DoricMargin; typedef UIEdgeInsets DoricPadding; @@ -101,4 +103,4 @@ typedef NS_ENUM(NSInteger, DoricGravity) { - (void)doricLayoutSubviews; - (BOOL)requestFromSubview:(UIView *)subview; -@end \ No newline at end of file +@end diff --git a/Pod/Classes/Util/DoricUtil.h b/Pod/Classes/Util/DoricUtil.h index ec67ceee..a6706b18 100644 --- a/Pod/Classes/Util/DoricUtil.h +++ b/Pod/Classes/Util/DoricUtil.h @@ -39,4 +39,4 @@ NSBundle *_Nonnull DoricBundle(void); void ShowToast(NSString *_Nonnull text, DoricGravity gravity); -UIImage *_Nonnull UIImageWithColor(UIColor *color); \ No newline at end of file +UIImage *_Nonnull UIImageWithColor(UIColor *color);