diff --git a/Keychain_Example.xcodeproj/project.pbxproj b/Keychain_Example.xcodeproj/project.pbxproj index ded3036..c8dbf09 100644 --- a/Keychain_Example.xcodeproj/project.pbxproj +++ b/Keychain_Example.xcodeproj/project.pbxproj @@ -16,7 +16,6 @@ 17959935288FE764003BBBC1 /* Keychain_Framework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17959934288FE764003BBBC1 /* Keychain_Framework.framework */; }; 17959936288FE764003BBBC1 /* Keychain_Framework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 17959934288FE764003BBBC1 /* Keychain_Framework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 17959939288FE7EA003BBBC1 /* UnexpectedNilError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17959938288FE7E9003BBBC1 /* UnexpectedNilError.swift */; }; - 63D389A41F7911CCDE0CDCCF /* Pods_Keychain_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F83A7D4B4E841CA74008AF49 /* Pods_Keychain_Example.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -55,9 +54,6 @@ 1795992D288FE6A5003BBBC1 /* KeychainWrapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainWrapperTests.swift; sourceTree = ""; }; 17959934288FE764003BBBC1 /* Keychain_Framework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Keychain_Framework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 17959938288FE7E9003BBBC1 /* UnexpectedNilError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnexpectedNilError.swift; sourceTree = ""; }; - 7A9DEB51F2FC9B45B659F4E2 /* Pods-Keychain_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Keychain_Example.debug.xcconfig"; path = "Target Support Files/Pods-Keychain_Example/Pods-Keychain_Example.debug.xcconfig"; sourceTree = ""; }; - A45FF606B5D88E3CA4E40EA3 /* Pods-Keychain_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Keychain_Example.release.xcconfig"; path = "Target Support Files/Pods-Keychain_Example/Pods-Keychain_Example.release.xcconfig"; sourceTree = ""; }; - F83A7D4B4E841CA74008AF49 /* Pods_Keychain_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Keychain_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -65,7 +61,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 63D389A41F7911CCDE0CDCCF /* Pods_Keychain_Example.framework in Frameworks */, 17959935288FE764003BBBC1 /* Keychain_Framework.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -104,11 +99,8 @@ isa = PBXGroup; children = ( 17959912288FE4B0003BBBC1 /* AppDelegate.swift */, - 17959916288FE4B0003BBBC1 /* ExampleKeychainWrapperViewController.swift */, - 17959918288FE4B0003BBBC1 /* Main.storyboard */, - 1795991B288FE4B2003BBBC1 /* Assets.xcassets */, - 1795991D288FE4B2003BBBC1 /* LaunchScreen.storyboard */, - 17959920288FE4B2003BBBC1 /* Info.plist */, + 6B9CC1B128D8670E00DE744A /* UI */, + 6B9CC1AF28D866FA00DE744A /* Resources */, ); path = Keychain_Example; sourceTree = ""; @@ -126,16 +118,40 @@ isa = PBXGroup; children = ( 17959934288FE764003BBBC1 /* Keychain_Framework.framework */, - F83A7D4B4E841CA74008AF49 /* Pods_Keychain_Example.framework */, ); name = Frameworks; sourceTree = ""; }; + 6B9CC1AF28D866FA00DE744A /* Resources */ = { + isa = PBXGroup; + children = ( + 17959920288FE4B2003BBBC1 /* Info.plist */, + 1795991B288FE4B2003BBBC1 /* Assets.xcassets */, + 6B9CC1B028D8670600DE744A /* UI */, + ); + path = Resources; + sourceTree = ""; + }; + 6B9CC1B028D8670600DE744A /* UI */ = { + isa = PBXGroup; + children = ( + 1795991D288FE4B2003BBBC1 /* LaunchScreen.storyboard */, + 17959918288FE4B0003BBBC1 /* Main.storyboard */, + ); + path = UI; + sourceTree = ""; + }; + 6B9CC1B128D8670E00DE744A /* UI */ = { + isa = PBXGroup; + children = ( + 17959916288FE4B0003BBBC1 /* ExampleKeychainWrapperViewController.swift */, + ); + path = UI; + sourceTree = ""; + }; FAB796C7698CBFFA9AD083D6 /* Pods */ = { isa = PBXGroup; children = ( - 7A9DEB51F2FC9B45B659F4E2 /* Pods-Keychain_Example.debug.xcconfig */, - A45FF606B5D88E3CA4E40EA3 /* Pods-Keychain_Example.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -147,12 +163,10 @@ isa = PBXNativeTarget; buildConfigurationList = 17959923288FE4B2003BBBC1 /* Build configuration list for PBXNativeTarget "Keychain_Example" */; buildPhases = ( - 5A07534BB726E42B3433B5B5 /* [CP] Check Pods Manifest.lock */, 17959926288FE509003BBBC1 /* Swiftlint */, 1795990B288FE4B0003BBBC1 /* Sources */, 1795990C288FE4B0003BBBC1 /* Frameworks */, 1795990D288FE4B0003BBBC1 /* Resources */, - 59A87F443C261CB22BF9D930 /* [CP] Embed Pods Frameworks */, 17959937288FE764003BBBC1 /* Embed Frameworks */, ); buildRules = ( @@ -259,45 +273,6 @@ shellPath = /bin/sh; shellScript = "#debug log\nset -x\n\n${PODS_ROOT}/SwiftLint/swiftlint\n"; }; - 59A87F443C261CB22BF9D930 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Keychain_Example/Pods-Keychain_Example-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Keychain_Example/Pods-Keychain_Example-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Keychain_Example/Pods-Keychain_Example-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 5A07534BB726E42B3433B5B5 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Keychain_Example-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -465,7 +440,6 @@ }; 17959924288FE4B2003BBBC1 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7A9DEB51F2FC9B45B659F4E2 /* Pods-Keychain_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -473,7 +447,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = MW2UF479VW; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Keychain_Example/Info.plist; + INFOPLIST_FILE = Keychain_Example/Resources/Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -495,7 +469,6 @@ }; 17959925288FE4B2003BBBC1 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A45FF606B5D88E3CA4E40EA3 /* Pods-Keychain_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -503,7 +476,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = MW2UF479VW; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Keychain_Example/Info.plist; + INFOPLIST_FILE = Keychain_Example/Resources/Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; diff --git a/Keychain_Example/Assets.xcassets/AccentColor.colorset/Contents.json b/Keychain_Example/Resources/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from Keychain_Example/Assets.xcassets/AccentColor.colorset/Contents.json rename to Keychain_Example/Resources/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/Keychain_Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Keychain_Example/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Keychain_Example/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Keychain_Example/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Keychain_Example/Assets.xcassets/Contents.json b/Keychain_Example/Resources/Assets.xcassets/Contents.json similarity index 100% rename from Keychain_Example/Assets.xcassets/Contents.json rename to Keychain_Example/Resources/Assets.xcassets/Contents.json diff --git a/Keychain_Example/Info.plist b/Keychain_Example/Resources/Info.plist similarity index 100% rename from Keychain_Example/Info.plist rename to Keychain_Example/Resources/Info.plist diff --git a/Keychain_Example/Base.lproj/LaunchScreen.storyboard b/Keychain_Example/Resources/UI/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Keychain_Example/Base.lproj/LaunchScreen.storyboard rename to Keychain_Example/Resources/UI/Base.lproj/LaunchScreen.storyboard diff --git a/Keychain_Example/Base.lproj/Main.storyboard b/Keychain_Example/Resources/UI/Base.lproj/Main.storyboard similarity index 100% rename from Keychain_Example/Base.lproj/Main.storyboard rename to Keychain_Example/Resources/UI/Base.lproj/Main.storyboard diff --git a/Keychain_Example/ExampleKeychainWrapperViewController.swift b/Keychain_Example/UI/ExampleKeychainWrapperViewController.swift similarity index 100% rename from Keychain_Example/ExampleKeychainWrapperViewController.swift rename to Keychain_Example/UI/ExampleKeychainWrapperViewController.swift diff --git a/Keychain_Framework.xcodeproj/project.pbxproj b/Keychain_Framework.xcodeproj/project.pbxproj index 4801c16..e0c796e 100644 --- a/Keychain_Framework.xcodeproj/project.pbxproj +++ b/Keychain_Framework.xcodeproj/project.pbxproj @@ -10,7 +10,6 @@ 179598F8288FE0FC003BBBC1 /* Keychain_Framework.h in Headers */ = {isa = PBXBuildFile; fileRef = 179598F7288FE0FC003BBBC1 /* Keychain_Framework.h */; settings = {ATTRIBUTES = (Public, ); }; }; 17959903288FE243003BBBC1 /* KeychainWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17959902288FE243003BBBC1 /* KeychainWrapper.swift */; }; 17959905288FE431003BBBC1 /* Shakuro.Keychain.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 17959904288FE431003BBBC1 /* Shakuro.Keychain.podspec */; }; - 2876AA513B04E2A2078D147C /* Pods_Keychain_Framework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E36D063C6D58862138B72E /* Pods_Keychain_Framework.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -21,9 +20,6 @@ 17959900288FE1C1003BBBC1 /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = ""; }; 17959902288FE243003BBBC1 /* KeychainWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainWrapper.swift; sourceTree = ""; }; 17959904288FE431003BBBC1 /* Shakuro.Keychain.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = Shakuro.Keychain.podspec; sourceTree = ""; }; - 50E36D063C6D58862138B72E /* Pods_Keychain_Framework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Keychain_Framework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 60810EE6B60F2FD5E829888C /* Pods-Keychain_Framework.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Keychain_Framework.release.xcconfig"; path = "Target Support Files/Pods-Keychain_Framework/Pods-Keychain_Framework.release.xcconfig"; sourceTree = ""; }; - 8532C88386CD8831118DD02D /* Pods-Keychain_Framework.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Keychain_Framework.debug.xcconfig"; path = "Target Support Files/Pods-Keychain_Framework/Pods-Keychain_Framework.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -31,21 +27,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2876AA513B04E2A2078D147C /* Pods_Keychain_Framework.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 06A8FE19D62CBD7D03FCADBF /* Frameworks */ = { - isa = PBXGroup; - children = ( - 50E36D063C6D58862138B72E /* Pods_Keychain_Framework.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 179598EA288FE0FC003BBBC1 = { isa = PBXGroup; children = ( @@ -55,8 +42,6 @@ 179598F6288FE0FC003BBBC1 /* Keychain_Framework */, 17959901288FE243003BBBC1 /* Source */, 179598F5288FE0FC003BBBC1 /* Products */, - F533EA9E2B0B7A144CEC2142 /* Pods */, - 06A8FE19D62CBD7D03FCADBF /* Frameworks */, ); sourceTree = ""; }; @@ -85,16 +70,6 @@ path = Source; sourceTree = ""; }; - F533EA9E2B0B7A144CEC2142 /* Pods */ = { - isa = PBXGroup; - children = ( - 8532C88386CD8831118DD02D /* Pods-Keychain_Framework.debug.xcconfig */, - 60810EE6B60F2FD5E829888C /* Pods-Keychain_Framework.release.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -113,7 +88,6 @@ isa = PBXNativeTarget; buildConfigurationList = 179598FB288FE0FC003BBBC1 /* Build configuration list for PBXNativeTarget "Keychain_Framework" */; buildPhases = ( - 10AEF47012B522F288DE287D /* [CP] Check Pods Manifest.lock */, 179598EF288FE0FC003BBBC1 /* Headers */, 179598F0288FE0FC003BBBC1 /* Sources */, 179598F1288FE0FC003BBBC1 /* Frameworks */, @@ -171,31 +145,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 10AEF47012B522F288DE287D /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Keychain_Framework-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 179598F0288FE0FC003BBBC1 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -330,7 +279,6 @@ }; 179598FC288FE0FC003BBBC1 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8532C88386CD8831118DD02D /* Pods-Keychain_Framework.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; @@ -360,7 +308,6 @@ }; 179598FD288FE0FC003BBBC1 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 60810EE6B60F2FD5E829888C /* Pods-Keychain_Framework.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1;