From 7bbab48af1bb96ecfb6e22f0365cef61a0999d4d Mon Sep 17 00:00:00 2001 From: Louis D'hauwe Date: Sun, 20 Nov 2016 16:27:07 +0100 Subject: [PATCH] Project refactor --- .swift-version | 1 + .../project.pbxproj | 61 ++++++------ .../xcschemes/BezierPathLength iOS.xcscheme | 99 +++++++++++++++++++ .../contents.xcworkspacedata | 2 +- .../BezierPathLengthTests.swift | 0 .../Info.plist | 0 Example/Example.xcodeproj/project.pbxproj | 6 +- .../xcschemes/iOS Example.xcscheme | 91 +++++++++++++++++ .../BezierPath+Length.swift | 0 .../BezierPathLength.h | 2 +- .../BezierPathLength => Source}/Info.plist | 0 .../PathElement.swift | 0 12 files changed, 230 insertions(+), 32 deletions(-) create mode 100755 .swift-version rename {BezierPathLength/BezierPathLength.xcodeproj => BezierPathLength.xcodeproj}/project.pbxproj (85%) create mode 100644 BezierPathLength.xcodeproj/xcshareddata/xcschemes/BezierPathLength iOS.xcscheme rename {BezierPathLength/BezierPathLengthTests => BezierPathLengthTests}/BezierPathLengthTests.swift (100%) rename {BezierPathLength/BezierPathLengthTests => BezierPathLengthTests}/Info.plist (100%) create mode 100644 Example/Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme rename {BezierPathLength/BezierPathLength => Source}/BezierPath+Length.swift (100%) rename {BezierPathLength/BezierPathLength => Source}/BezierPathLength.h (95%) rename {BezierPathLength/BezierPathLength => Source}/Info.plist (100%) rename {BezierPathLength/BezierPathLength => Source}/PathElement.swift (100%) diff --git a/.swift-version b/.swift-version new file mode 100755 index 0000000..cb2b00e --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +3.0.1 diff --git a/BezierPathLength/BezierPathLength.xcodeproj/project.pbxproj b/BezierPathLength.xcodeproj/project.pbxproj similarity index 85% rename from BezierPathLength/BezierPathLength.xcodeproj/project.pbxproj rename to BezierPathLength.xcodeproj/project.pbxproj index 306b083..ce865be 100644 --- a/BezierPathLength/BezierPathLength.xcodeproj/project.pbxproj +++ b/BezierPathLength.xcodeproj/project.pbxproj @@ -9,9 +9,9 @@ /* Begin PBXBuildFile section */ BE8116261DDFB02A00FD263E /* BezierPathLength.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE81161C1DDFB02900FD263E /* BezierPathLength.framework */; }; BE81162B1DDFB02A00FD263E /* BezierPathLengthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE81162A1DDFB02A00FD263E /* BezierPathLengthTests.swift */; }; - BE81162D1DDFB02A00FD263E /* BezierPathLength.h in Headers */ = {isa = PBXBuildFile; fileRef = BE81161F1DDFB02900FD263E /* BezierPathLength.h */; settings = {ATTRIBUTES = (Public, ); }; }; - BE81163B1DDFBDF100FD263E /* PathElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE8116391DDFBDF100FD263E /* PathElement.swift */; }; - BE81163C1DDFBDF100FD263E /* BezierPath+Length.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE81163A1DDFBDF100FD263E /* BezierPath+Length.swift */; }; + BE9254F61DE1F5160004AD58 /* BezierPath+Length.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9254F21DE1F5160004AD58 /* BezierPath+Length.swift */; }; + BE9254F71DE1F5160004AD58 /* BezierPathLength.h in Headers */ = {isa = PBXBuildFile; fileRef = BE9254F31DE1F5160004AD58 /* BezierPathLength.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BE9254F91DE1F5160004AD58 /* PathElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9254F51DE1F5160004AD58 /* PathElement.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -26,13 +26,13 @@ /* Begin PBXFileReference section */ BE81161C1DDFB02900FD263E /* BezierPathLength.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BezierPathLength.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BE81161F1DDFB02900FD263E /* BezierPathLength.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BezierPathLength.h; sourceTree = ""; }; - BE8116201DDFB02900FD263E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; BE8116251DDFB02A00FD263E /* BezierPathLengthTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BezierPathLengthTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; BE81162A1DDFB02A00FD263E /* BezierPathLengthTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BezierPathLengthTests.swift; sourceTree = ""; }; BE81162C1DDFB02A00FD263E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BE8116391DDFBDF100FD263E /* PathElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PathElement.swift; sourceTree = ""; }; - BE81163A1DDFBDF100FD263E /* BezierPath+Length.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BezierPath+Length.swift"; sourceTree = ""; }; + BE9254F21DE1F5160004AD58 /* BezierPath+Length.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "BezierPath+Length.swift"; path = "Source/BezierPath+Length.swift"; sourceTree = SOURCE_ROOT; }; + BE9254F31DE1F5160004AD58 /* BezierPathLength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BezierPathLength.h; path = Source/BezierPathLength.h; sourceTree = SOURCE_ROOT; }; + BE9254F41DE1F5160004AD58 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; sourceTree = SOURCE_ROOT; }; + BE9254F51DE1F5160004AD58 /* PathElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PathElement.swift; path = Source/PathElement.swift; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,7 +57,7 @@ BE8116121DDFB02900FD263E = { isa = PBXGroup; children = ( - BE81161E1DDFB02900FD263E /* BezierPathLength */, + BE81161E1DDFB02900FD263E /* Source */, BE8116291DDFB02A00FD263E /* BezierPathLengthTests */, BE81161D1DDFB02900FD263E /* Products */, ); @@ -72,14 +72,15 @@ name = Products; sourceTree = ""; }; - BE81161E1DDFB02900FD263E /* BezierPathLength */ = { + BE81161E1DDFB02900FD263E /* Source */ = { isa = PBXGroup; children = ( - BE8116391DDFBDF100FD263E /* PathElement.swift */, - BE81163A1DDFBDF100FD263E /* BezierPath+Length.swift */, - BE81161F1DDFB02900FD263E /* BezierPathLength.h */, - BE8116201DDFB02900FD263E /* Info.plist */, + BE9254F21DE1F5160004AD58 /* BezierPath+Length.swift */, + BE9254F31DE1F5160004AD58 /* BezierPathLength.h */, + BE9254F41DE1F5160004AD58 /* Info.plist */, + BE9254F51DE1F5160004AD58 /* PathElement.swift */, ); + name = Source; path = BezierPathLength; sourceTree = ""; }; @@ -99,16 +100,16 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - BE81162D1DDFB02A00FD263E /* BezierPathLength.h in Headers */, + BE9254F71DE1F5160004AD58 /* BezierPathLength.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - BE81161B1DDFB02900FD263E /* BezierPathLength */ = { + BE81161B1DDFB02900FD263E /* BezierPathLength iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = BE8116301DDFB02A00FD263E /* Build configuration list for PBXNativeTarget "BezierPathLength" */; + buildConfigurationList = BE8116301DDFB02A00FD263E /* Build configuration list for PBXNativeTarget "BezierPathLength iOS" */; buildPhases = ( BE8116171DDFB02900FD263E /* Sources */, BE8116181DDFB02900FD263E /* Frameworks */, @@ -119,7 +120,7 @@ ); dependencies = ( ); - name = BezierPathLength; + name = "BezierPathLength iOS"; productName = BezierPathLength; productReference = BE81161C1DDFB02900FD263E /* BezierPathLength.framework */; productType = "com.apple.product-type.framework"; @@ -177,7 +178,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - BE81161B1DDFB02900FD263E /* BezierPathLength */, + BE81161B1DDFB02900FD263E /* BezierPathLength iOS */, BE8116241DDFB02A00FD263E /* BezierPathLengthTests */, ); }; @@ -205,8 +206,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - BE81163B1DDFBDF100FD263E /* PathElement.swift in Sources */, - BE81163C1DDFBDF100FD263E /* BezierPath+Length.swift in Sources */, + BE9254F61DE1F5160004AD58 /* BezierPath+Length.swift in Sources */, + BE9254F91DE1F5160004AD58 /* PathElement.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -223,7 +224,7 @@ /* Begin PBXTargetDependency section */ BE8116281DDFB02A00FD263E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = BE81161B1DDFB02900FD263E /* BezierPathLength */; + target = BE81161B1DDFB02900FD263E /* BezierPathLength iOS */; targetProxy = BE8116271DDFB02A00FD263E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -270,7 +271,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -318,7 +319,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -340,12 +341,13 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = BezierPathLength/Info.plist; + INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = be.silverfox.BezierPathLength; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_MODULE_NAME = BezierPathLength; + PRODUCT_NAME = BezierPathLength; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0.1; @@ -362,12 +364,13 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = BezierPathLength/Info.plist; + INFOPLIST_FILE = Source/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = be.silverfox.BezierPathLength; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_MODULE_NAME = BezierPathLength; + PRODUCT_NAME = BezierPathLength; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0.1; }; @@ -411,13 +414,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BE8116301DDFB02A00FD263E /* Build configuration list for PBXNativeTarget "BezierPathLength" */ = { + BE8116301DDFB02A00FD263E /* Build configuration list for PBXNativeTarget "BezierPathLength iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( BE8116311DDFB02A00FD263E /* Debug */, BE8116321DDFB02A00FD263E /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; BE8116331DDFB02A00FD263E /* Build configuration list for PBXNativeTarget "BezierPathLengthTests" */ = { isa = XCConfigurationList; @@ -426,6 +430,7 @@ BE8116351DDFB02A00FD263E /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/BezierPathLength.xcodeproj/xcshareddata/xcschemes/BezierPathLength iOS.xcscheme b/BezierPathLength.xcodeproj/xcshareddata/xcschemes/BezierPathLength iOS.xcscheme new file mode 100644 index 0000000..3bce2e7 --- /dev/null +++ b/BezierPathLength.xcodeproj/xcshareddata/xcschemes/BezierPathLength iOS.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BezierPathLength.xcworkspace/contents.xcworkspacedata b/BezierPathLength.xcworkspace/contents.xcworkspacedata index d3d1dc4..03af208 100644 --- a/BezierPathLength.xcworkspace/contents.xcworkspacedata +++ b/BezierPathLength.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:Example/../BezierPathLength.xcodeproj"> diff --git a/BezierPathLength/BezierPathLengthTests/BezierPathLengthTests.swift b/BezierPathLengthTests/BezierPathLengthTests.swift similarity index 100% rename from BezierPathLength/BezierPathLengthTests/BezierPathLengthTests.swift rename to BezierPathLengthTests/BezierPathLengthTests.swift diff --git a/BezierPathLength/BezierPathLengthTests/Info.plist b/BezierPathLengthTests/Info.plist similarity index 100% rename from BezierPathLength/BezierPathLengthTests/Info.plist rename to BezierPathLengthTests/Info.plist diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index 224e445..700663f 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -240,7 +240,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -285,7 +285,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -301,6 +301,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = 6G5LMQ72D8; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = be.silverfox.Example; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -314,6 +315,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = 6G5LMQ72D8; INFOPLIST_FILE = Example/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = be.silverfox.Example; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme new file mode 100644 index 0000000..a4a6e67 --- /dev/null +++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/iOS Example.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BezierPathLength/BezierPathLength/BezierPath+Length.swift b/Source/BezierPath+Length.swift similarity index 100% rename from BezierPathLength/BezierPathLength/BezierPath+Length.swift rename to Source/BezierPath+Length.swift diff --git a/BezierPathLength/BezierPathLength/BezierPathLength.h b/Source/BezierPathLength.h similarity index 95% rename from BezierPathLength/BezierPathLength/BezierPathLength.h rename to Source/BezierPathLength.h index cdcfb95..ced9769 100644 --- a/BezierPathLength/BezierPathLength/BezierPathLength.h +++ b/Source/BezierPathLength.h @@ -6,7 +6,7 @@ // Copyright © 2016 Silver Fox. All rights reserved. // -#import +@import Foundation; //! Project version number for BezierPathLength. FOUNDATION_EXPORT double BezierPathLengthVersionNumber; diff --git a/BezierPathLength/BezierPathLength/Info.plist b/Source/Info.plist similarity index 100% rename from BezierPathLength/BezierPathLength/Info.plist rename to Source/Info.plist diff --git a/BezierPathLength/BezierPathLength/PathElement.swift b/Source/PathElement.swift similarity index 100% rename from BezierPathLength/BezierPathLength/PathElement.swift rename to Source/PathElement.swift