Skip to content

Commit

Permalink
fixed project struct and pods deintegrated
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneKlyuenkov committed Sep 19, 2022
1 parent 8c68a70 commit 6c4ca1b
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 111 deletions.
89 changes: 31 additions & 58 deletions Keychain_Example.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -55,17 +54,13 @@
1795992D288FE6A5003BBBC1 /* KeychainWrapperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainWrapperTests.swift; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 */
1795990C288FE4B0003BBBC1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
63D389A41F7911CCDE0CDCCF /* Pods_Keychain_Example.framework in Frameworks */,
17959935288FE764003BBBC1 /* Keychain_Framework.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -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 = "<group>";
Expand All @@ -126,16 +118,40 @@
isa = PBXGroup;
children = (
17959934288FE764003BBBC1 /* Keychain_Framework.framework */,
F83A7D4B4E841CA74008AF49 /* Pods_Keychain_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
6B9CC1AF28D866FA00DE744A /* Resources */ = {
isa = PBXGroup;
children = (
17959920288FE4B2003BBBC1 /* Info.plist */,
1795991B288FE4B2003BBBC1 /* Assets.xcassets */,
6B9CC1B028D8670600DE744A /* UI */,
);
path = Resources;
sourceTree = "<group>";
};
6B9CC1B028D8670600DE744A /* UI */ = {
isa = PBXGroup;
children = (
1795991D288FE4B2003BBBC1 /* LaunchScreen.storyboard */,
17959918288FE4B0003BBBC1 /* Main.storyboard */,
);
path = UI;
sourceTree = "<group>";
};
6B9CC1B128D8670E00DE744A /* UI */ = {
isa = PBXGroup;
children = (
17959916288FE4B0003BBBC1 /* ExampleKeychainWrapperViewController.swift */,
);
path = UI;
sourceTree = "<group>";
};
FAB796C7698CBFFA9AD083D6 /* Pods */ = {
isa = PBXGroup;
children = (
7A9DEB51F2FC9B45B659F4E2 /* Pods-Keychain_Example.debug.xcconfig */,
A45FF606B5D88E3CA4E40EA3 /* Pods-Keychain_Example.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand All @@ -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 = (
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -465,15 +440,14 @@
};
17959924288FE4B2003BBBC1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7A9DEB51F2FC9B45B659F4E2 /* Pods-Keychain_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
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;
Expand All @@ -495,15 +469,14 @@
};
17959925288FE4B2003BBBC1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A45FF606B5D88E3CA4E40EA3 /* Pods-Keychain_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
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;
Expand Down
0 ...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
View file
File renamed without changes.
0 ...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
View file
File renamed without changes.
0 ...ain_Example/Assets.xcassets/Contents.json → ...e/Resources/Assets.xcassets/Contents.json
View file
File renamed without changes.
0 Keychain_Example/Info.plist → Keychain_Example/Resources/Info.plist
View file
File renamed without changes.
0 ...xample/Base.lproj/LaunchScreen.storyboard → ...ces/UI/Base.lproj/LaunchScreen.storyboard
View file
File renamed without changes.
0 Keychain_Example/Base.lproj/Main.storyboard → ...e/Resources/UI/Base.lproj/Main.storyboard
View file
File renamed without changes.
0 ...xampleKeychainWrapperViewController.swift → ...xampleKeychainWrapperViewController.swift
View file
File renamed without changes.
53 changes: 0 additions & 53 deletions Keychain_Framework.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -21,31 +20,19 @@
17959900288FE1C1003BBBC1 /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = "<group>"; };
17959902288FE243003BBBC1 /* KeychainWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainWrapper.swift; sourceTree = "<group>"; };
17959904288FE431003BBBC1 /* Shakuro.Keychain.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = Shakuro.Keychain.podspec; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
179598F1288FE0FC003BBBC1 /* Frameworks */ = {
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 = "<group>";
};
179598EA288FE0FC003BBBC1 = {
isa = PBXGroup;
children = (
Expand All @@ -55,8 +42,6 @@
179598F6288FE0FC003BBBC1 /* Keychain_Framework */,
17959901288FE243003BBBC1 /* Source */,
179598F5288FE0FC003BBBC1 /* Products */,
F533EA9E2B0B7A144CEC2142 /* Pods */,
06A8FE19D62CBD7D03FCADBF /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -85,16 +70,6 @@
path = Source;
sourceTree = "<group>";
};
F533EA9E2B0B7A144CEC2142 /* Pods */ = {
isa = PBXGroup;
children = (
8532C88386CD8831118DD02D /* Pods-Keychain_Framework.debug.xcconfig */,
60810EE6B60F2FD5E829888C /* Pods-Keychain_Framework.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand All @@ -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 */,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -330,7 +279,6 @@
};
179598FC288FE0FC003BBBC1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8532C88386CD8831118DD02D /* Pods-Keychain_Framework.debug.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
Expand Down Expand Up @@ -360,7 +308,6 @@
};
179598FD288FE0FC003BBBC1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 60810EE6B60F2FD5E829888C /* Pods-Keychain_Framework.release.xcconfig */;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
Expand Down

0 comments on commit 6c4ca1b

Please sign in to comment.