Skip to content

Commit

Permalink
Merge pull request #12 from hyperoslo/fix/rename
Browse files Browse the repository at this point in the history 
Rename to Keychains
  • Loading branch information
@onmyway133
onmyway133 authored Jun 19, 2017
2 parents 1c53e13 + 26e89ce commit c3dadc0
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 69 deletions.
17 changes: 8 additions & 9 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
osx_image: xcode8
language: objective-c
cache: cocoapods
before_install: gem install cocoapods obcd slather -N

# Use when you don't have third party dependencies
script: xctool -project Pod/Pod.xcodeproj -scheme Tests -sdk iphonesimulator build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test
script:
- xcodebuild clean build -project Keychains.xcodeproj -scheme "Keychains-Mac" -sdk macosx
- xcodebuild test -project Keychains.xcodeproj -scheme "Keychains-Mac" -sdk macosx
- xcodebuild clean build -project Keychains.xcodeproj -scheme "Keychains-iOS" -sdk iphonesimulator
- xcodebuild test -project Keychains.xcodeproj -scheme "Keychains-iOS" -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' | xcpretty

# Use when you have third party dependencies (CocoaPods generates a workspace)
# podfile: Pod/Podfile
# script: xctool -workspace Pod/Pod.xcworkspace -scheme Tests -sdk iphonesimulator build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test

after_success: slather
notifications:
email: false
6 changes: 3 additions & 3 deletions Keychain.podspec → Keychains.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = "Keychain"
s.name = "Keychains"
s.summary = "A keychain wrapper that is so easy to use that your cat could use it."
s.version = "1.0.0"
s.homepage = "https://github.com/hyperoslo/Keychain"
s.homepage = "https://github.com/hyperoslo/Keychains"
s.license = 'MIT'
s.author = { "Hyper Interaktiv AS" => "ios@hyper.no" }
s.source = { :git => "https://github.com/hyperoslo/Keychain.git", :tag => s.version.to_s }
s.source = { :git => "https://github.com/hyperoslo/Keychains.git", :tag => s.version.to_s }
s.social_media_url = 'https://twitter.com/hyperoslo'

s.ios.deployment_target = '8.0'
Expand Down
64 changes: 32 additions & 32 deletions Keychain.xcodeproj/project.pbxproj → Keychains.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
objects = {

/* Begin PBXBuildFile section */
BDA447EC1C294B45003FDEAD /* Keychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDA447E21C294B45003FDEAD /* Keychain.framework */; };
BDA447EC1C294B45003FDEAD /* Keychains.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDA447E21C294B45003FDEAD /* Keychains.framework */; };
BDA448021C294B9F003FDEAD /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA448011C294B9F003FDEAD /* Keychain.swift */; };
BDA448031C294B9F003FDEAD /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA448011C294B9F003FDEAD /* Keychain.swift */; };
BDA448141C294C29003FDEAD /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BDA4480E1C294C29003FDEAD /* Info.plist */; };
BDA448151C294C29003FDEAD /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BDA448101C294C29003FDEAD /* Info.plist */; };
BDA448171C294C29003FDEAD /* TestKeychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA448121C294C29003FDEAD /* TestKeychain.swift */; };
BDA448181C294C29003FDEAD /* TestKeychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDA448121C294C29003FDEAD /* TestKeychain.swift */; };
D56DA9E71C20608E003E7253 /* Keychain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D56DA9DC1C20608E003E7253 /* Keychain.framework */; };
D56DA9E71C20608E003E7253 /* Keychains.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D56DA9DC1C20608E003E7253 /* Keychains.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -35,15 +35,15 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
BDA447E21C294B45003FDEAD /* Keychain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Keychain.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BDA447E21C294B45003FDEAD /* Keychains.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Keychains.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BDA447EB1C294B45003FDEAD /* Tests-Mac.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests-Mac.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
BDA447FB1C294B68003FDEAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BDA447FD1C294B68003FDEAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BDA448011C294B9F003FDEAD /* Keychain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = "<group>"; };
BDA4480E1C294C29003FDEAD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BDA448101C294C29003FDEAD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BDA448121C294C29003FDEAD /* TestKeychain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestKeychain.swift; sourceTree = "<group>"; };
D56DA9DC1C20608E003E7253 /* Keychain.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Keychain.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D56DA9DC1C20608E003E7253 /* Keychains.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Keychains.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D56DA9E61C20608E003E7253 /* Tests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand All @@ -59,7 +59,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BDA447EC1C294B45003FDEAD /* Keychain.framework in Frameworks */,
BDA447EC1C294B45003FDEAD /* Keychains.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -74,7 +74,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D56DA9E71C20608E003E7253 /* Keychain.framework in Frameworks */,
D56DA9E71C20608E003E7253 /* Keychains.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -169,9 +169,9 @@
D56DA9DD1C20608E003E7253 /* Products */ = {
isa = PBXGroup;
children = (
D56DA9DC1C20608E003E7253 /* Keychain.framework */,
D56DA9DC1C20608E003E7253 /* Keychains.framework */,
D56DA9E61C20608E003E7253 /* Tests-iOS.xctest */,
BDA447E21C294B45003FDEAD /* Keychain.framework */,
BDA447E21C294B45003FDEAD /* Keychains.framework */,
BDA447EB1C294B45003FDEAD /* Tests-Mac.xctest */,
);
name = Products;
Expand All @@ -197,9 +197,9 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
BDA447E11C294B45003FDEAD /* Keychain-Mac */ = {
BDA447E11C294B45003FDEAD /* Keychains-Mac */ = {
isa = PBXNativeTarget;
buildConfigurationList = BDA447F31C294B45003FDEAD /* Build configuration list for PBXNativeTarget "Keychain-Mac" */;
buildConfigurationList = BDA447F31C294B45003FDEAD /* Build configuration list for PBXNativeTarget "Keychains-Mac" */;
buildPhases = (
BDA447DD1C294B45003FDEAD /* Sources */,
BDA447DE1C294B45003FDEAD /* Frameworks */,
Expand All @@ -210,9 +210,9 @@
);
dependencies = (
);
name = "Keychain-Mac";
name = "Keychains-Mac";
productName = "Keychain-Mac";
productReference = BDA447E21C294B45003FDEAD /* Keychain.framework */;
productReference = BDA447E21C294B45003FDEAD /* Keychains.framework */;
productType = "com.apple.product-type.framework";
};
BDA447EA1C294B45003FDEAD /* Tests-Mac */ = {
Expand All @@ -233,9 +233,9 @@
productReference = BDA447EB1C294B45003FDEAD /* Tests-Mac.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
D56DA9DB1C20608E003E7253 /* Keychain-iOS */ = {
D56DA9DB1C20608E003E7253 /* Keychains-iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = D56DA9F01C20608E003E7253 /* Build configuration list for PBXNativeTarget "Keychain-iOS" */;
buildConfigurationList = D56DA9F01C20608E003E7253 /* Build configuration list for PBXNativeTarget "Keychains-iOS" */;
buildPhases = (
D56DA9D71C20608E003E7253 /* Sources */,
D56DA9D81C20608E003E7253 /* Frameworks */,
Expand All @@ -246,9 +246,9 @@
);
dependencies = (
);
name = "Keychain-iOS";
name = "Keychains-iOS";
productName = Keychain;
productReference = D56DA9DC1C20608E003E7253 /* Keychain.framework */;
productReference = D56DA9DC1C20608E003E7253 /* Keychains.framework */;
productType = "com.apple.product-type.framework";
};
D56DA9E51C20608E003E7253 /* Tests-iOS */ = {
Expand Down Expand Up @@ -295,7 +295,7 @@
};
};
};
buildConfigurationList = D56DA9D61C20608E003E7253 /* Build configuration list for PBXProject "Keychain" */;
buildConfigurationList = D56DA9D61C20608E003E7253 /* Build configuration list for PBXProject "Keychains" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -307,9 +307,9 @@
projectDirPath = "";
projectRoot = "";
targets = (
D56DA9DB1C20608E003E7253 /* Keychain-iOS */,
D56DA9DB1C20608E003E7253 /* Keychains-iOS */,
D56DA9E51C20608E003E7253 /* Tests-iOS */,
BDA447E11C294B45003FDEAD /* Keychain-Mac */,
BDA447E11C294B45003FDEAD /* Keychains-Mac */,
BDA447EA1C294B45003FDEAD /* Tests-Mac */,
);
};
Expand Down Expand Up @@ -386,12 +386,12 @@
/* Begin PBXTargetDependency section */
BDA447EE1C294B45003FDEAD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = BDA447E11C294B45003FDEAD /* Keychain-Mac */;
target = BDA447E11C294B45003FDEAD /* Keychains-Mac */;
targetProxy = BDA447ED1C294B45003FDEAD /* PBXContainerItemProxy */;
};
D56DA9E91C20608E003E7253 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = D56DA9DB1C20608E003E7253 /* Keychain-iOS */;
target = D56DA9DB1C20608E003E7253 /* Keychains-iOS */;
targetProxy = D56DA9E81C20608E003E7253 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand All @@ -411,8 +411,8 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Keychain-Mac";
PRODUCT_NAME = Keychain;
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Keychains-Mac";
PRODUCT_NAME = Keychains;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
Expand All @@ -433,8 +433,8 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Keychain-Mac";
PRODUCT_NAME = Keychain;
PRODUCT_BUNDLE_IDENTIFIER = "no.hyper.Keychains-Mac";
PRODUCT_NAME = Keychains;
SDKROOT = macosx;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
Expand Down Expand Up @@ -577,8 +577,8 @@
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 = no.hyper.Keychain;
PRODUCT_NAME = Keychain;
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Keychains;
PRODUCT_NAME = Keychains;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
Expand All @@ -596,8 +596,8 @@
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 = no.hyper.Keychain;
PRODUCT_NAME = Keychain;
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Keychains;
PRODUCT_NAME = Keychains;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
Expand Down Expand Up @@ -628,7 +628,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
BDA447F31C294B45003FDEAD /* Build configuration list for PBXNativeTarget "Keychain-Mac" */ = {
BDA447F31C294B45003FDEAD /* Build configuration list for PBXNativeTarget "Keychains-Mac" */ = {
isa = XCConfigurationList;
buildConfigurations = (
BDA447F41C294B45003FDEAD /* Debug */,
Expand All @@ -646,7 +646,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D56DA9D61C20608E003E7253 /* Build configuration list for PBXProject "Keychain" */ = {
D56DA9D61C20608E003E7253 /* Build configuration list for PBXProject "Keychains" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D56DA9EE1C20608E003E7253 /* Debug */,
Expand All @@ -655,7 +655,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D56DA9F01C20608E003E7253 /* Build configuration list for PBXNativeTarget "Keychain-iOS" */ = {
D56DA9F01C20608E003E7253 /* Build configuration list for PBXNativeTarget "Keychains-iOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D56DA9F11C20608E003E7253 /* Debug */,
Expand Down
2 changes: 1 addition & 1 deletion ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions ...hareddata/xcschemes/Keychain-Mac.xcscheme → ...hareddata/xcschemes/Keychain-Mac.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDA447E11C294B45003FDEAD"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-Mac"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-Mac"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -35,7 +35,7 @@
BlueprintIdentifier = "BDA447EA1C294B45003FDEAD"
BuildableName = "Tests-Mac.xctest"
BlueprintName = "Tests-Mac"
ReferencedContainer = "container:Keychain.xcodeproj">
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -44,8 +44,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDA447E11C294B45003FDEAD"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-Mac"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-Mac"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -66,8 +66,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDA447E11C294B45003FDEAD"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-Mac"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-Mac"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -84,8 +84,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDA447E11C294B45003FDEAD"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-Mac"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-Mac"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
18 changes: 9 additions & 9 deletions ...hareddata/xcschemes/Keychain-iOS.xcscheme → ...hareddata/xcschemes/Keychain-iOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "D56DA9DB1C20608E003E7253"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-iOS"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-iOS"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -35,7 +35,7 @@
BlueprintIdentifier = "D56DA9E51C20608E003E7253"
BuildableName = "Tests-iOS.xctest"
BlueprintName = "Tests-iOS"
ReferencedContainer = "container:Keychain.xcodeproj">
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -44,8 +44,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "D56DA9DB1C20608E003E7253"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-iOS"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-iOS"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -66,8 +66,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "D56DA9DB1C20608E003E7253"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-iOS"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-iOS"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
Expand All @@ -84,8 +84,8 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "D56DA9DB1C20608E003E7253"
BuildableName = "Keychain.framework"
BlueprintName = "Keychain-iOS"
ReferencedContainer = "container:Keychain.xcodeproj">
BlueprintName = "Keychains-iOS"
ReferencedContainer = "container:Keychains.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
Expand Down
Loading

0 comments on commit c3dadc0

Please sign in to comment.