Skip to content

Commit

Permalink
Merge 08ea6de into 0d649e3
Browse files Browse the repository at this point in the history
  • Loading branch information
@kimmytaft
kimmytaft committed Oct 12, 2018
2 parents 0d649e3 + 08ea6de commit 1b6c8ed
Show file tree
Hide file tree
Showing 14 changed files with 360 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.0
2.4.0
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: objective-c
matrix:
include:
- osx_image: xcode9.3
- osx_image: xcode9.4
install:
- gem install jazzy
- gem install slather
- gem install slather -v 2.4.5
before_script:
- rm -rf ~/Library/Developer/Xcode/DerivedData
script:
Expand Down
62 changes: 41 additions & 21 deletions IBMCloudAppID.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
0987DBB8214C5E3600C01812 /* SecurityUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA200D1E51F7D9000EB3F5 /* SecurityUtils.swift */; };
0987DBBB2151865D00C01812 /* SecAttrAccessible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0987DBBA2151865D00C01812 /* SecAttrAccessible.swift */; };
181050421EE1BD9200AAA443 /* TokenResponseDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181050411EE1BD9200AAA443 /* TokenResponseDelegate.swift */; };
4D42CF8A20173BD200EF40B6 /* RefreshToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D42CF8920173BD200EF40B6 /* RefreshToken.swift */; };
4D42CF8C20173BDD00EF40B6 /* RefreshTokenImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D42CF8B20173BDD00EF40B6 /* RefreshTokenImpl.swift */; };
Expand Down Expand Up @@ -58,7 +60,6 @@
EFBA20561E51F7D9000EB3F5 /* PreferenceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA200A1E51F7D9000EB3F5 /* PreferenceManager.swift */; };
EFBA20581E51F7D9000EB3F5 /* RegistrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA200B1E51F7D9000EB3F5 /* RegistrationManager.swift */; };
EFBA205A1E51F7D9000EB3F5 /* safariView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA200C1E51F7D9000EB3F5 /* safariView.swift */; };
EFBA205C1E51F7D9000EB3F5 /* SecurityUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA200D1E51F7D9000EB3F5 /* SecurityUtils.swift */; };
EFBA205E1E51F7D9000EB3F5 /* StringPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA200E1E51F7D9000EB3F5 /* StringPreference.swift */; };
EFBA20601E51F7D9000EB3F5 /* TokenManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA200F1E51F7D9000EB3F5 /* TokenManager.swift */; };
EFBA20621E51F7D9000EB3F5 /* AbstractToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFBA20111E51F7D9000EB3F5 /* AbstractToken.swift */; };
Expand Down Expand Up @@ -90,20 +91,18 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
0987DBBA2151865D00C01812 /* SecAttrAccessible.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecAttrAccessible.swift; sourceTree = "<group>"; };
181050411EE1BD9200AAA443 /* TokenResponseDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenResponseDelegate.swift; sourceTree = "<group>"; };
3A523D88E31CC7EC37CAFA1D /* Pods-IBMCloudAppID.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBMCloudAppID.release.xcconfig"; path = "Pods/Target Support Files/Pods-IBMCloudAppID/Pods-IBMCloudAppID.release.xcconfig"; sourceTree = "<group>"; };
4D42CF8920173BD200EF40B6 /* RefreshToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshToken.swift; sourceTree = "<group>"; };
4D42CF8B20173BDD00EF40B6 /* RefreshTokenImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshTokenImpl.swift; sourceTree = "<group>"; };
650D1FFAD2CCE197FAA0DE4F /* Pods-IBMCloudAppIDTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBMCloudAppIDTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-IBMCloudAppIDTests/Pods-IBMCloudAppIDTests.release.xcconfig"; sourceTree = "<group>"; };
66E951CC5B401814BE794DBE /* Pods-BluemixAppIDTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BluemixAppIDTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BluemixAppIDTests/Pods-BluemixAppIDTests.debug.xcconfig"; sourceTree = "<group>"; };
8B1AE9343AB77B8B9C396E21 /* Pods_IBMCloudAppID.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IBMCloudAppID.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8D5F58BDE9E7A759720873B7 /* Pods_BluemixAppIDTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BluemixAppIDTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A59C9CA3B04FBE6AC2A4D28C /* Pods-IBMCloudAppID.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBMCloudAppID.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IBMCloudAppID/Pods-IBMCloudAppID.debug.xcconfig"; sourceTree = "<group>"; };
BDC0D53E1E5EF68300444F9E /* UserProfileManagerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserProfileManagerImpl.swift; sourceTree = "<group>"; };
BDF5878E1E66C55A00393C0C /* UserProfileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserProfileTests.swift; sourceTree = "<group>"; };
CB32128A91C6C77CEBDAC128 /* Pods_IBMCloudAppIDTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IBMCloudAppIDTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D419D8062637A352B06716FC /* Pods-BluemixAppIDTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BluemixAppIDTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-BluemixAppIDTests/Pods-BluemixAppIDTests.release.xcconfig"; sourceTree = "<group>"; };
D7C1B0698BAAA534E21A1C51 /* Pods-BluemixAppID.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BluemixAppID.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BluemixAppID/Pods-BluemixAppID.debug.xcconfig"; sourceTree = "<group>"; };
EAB745E0C2A5F53D2FA7CC32 /* Pods-IBMCloudAppIDTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-IBMCloudAppIDTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-IBMCloudAppIDTests/Pods-IBMCloudAppIDTests.debug.xcconfig"; sourceTree = "<group>"; };
EF37F8B91E534C2D0020E998 /* AuthorizationUIManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthorizationUIManagerTests.swift; sourceTree = "<group>"; };
EF37F8BB1E5487C40020E998 /* TestHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestHelpers.swift; sourceTree = "<group>"; };
Expand All @@ -115,7 +114,6 @@
EF3B3BEB1E55C4E900DFFF13 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
EF3B3BED1E55C4E900DFFF13 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EF77D5371E52085800C4B87F /* RegistrationManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationManagerTests.swift; sourceTree = "<group>"; };
EFB619554546A4A1C879BF50 /* Pods-BluemixAppID.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BluemixAppID.release.xcconfig"; path = "Pods/Target Support Files/Pods-BluemixAppID/Pods-BluemixAppID.release.xcconfig"; sourceTree = "<group>"; };
EFB7F3B11E5307F20099BEDC /* AuthorizationManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthorizationManagerTests.swift; sourceTree = "<group>"; };
EFB876361E533E9400E017FA /* ConfigTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigTests.swift; sourceTree = "<group>"; };
EFB876381E53434800E017FA /* OAuthClientTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OAuthClientTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -200,10 +198,6 @@
52AD538B40EAAC9A3BBD7B9E /* Pods */ = {
isa = PBXGroup;
children = (
D7C1B0698BAAA534E21A1C51 /* Pods-BluemixAppID.debug.xcconfig */,
EFB619554546A4A1C879BF50 /* Pods-BluemixAppID.release.xcconfig */,
66E951CC5B401814BE794DBE /* Pods-BluemixAppIDTests.debug.xcconfig */,
D419D8062637A352B06716FC /* Pods-BluemixAppIDTests.release.xcconfig */,
A59C9CA3B04FBE6AC2A4D28C /* Pods-IBMCloudAppID.debug.xcconfig */,
3A523D88E31CC7EC37CAFA1D /* Pods-IBMCloudAppID.release.xcconfig */,
EAB745E0C2A5F53D2FA7CC32 /* Pods-IBMCloudAppIDTests.debug.xcconfig */,
Expand Down Expand Up @@ -282,6 +276,7 @@
EFBA1FFA1E51F7D9000EB3F5 /* Tokens */,
EFBA1FFE1E51F7D9000EB3F5 /* UserProfileError.swift */,
EFBA1FFF1E51F7D9000EB3F5 /* UserProfileManager.swift */,
0987DBBA2151865D00C01812 /* SecAttrAccessible.swift */,
);
path = api;
sourceTree = "<group>";
Expand Down Expand Up @@ -481,7 +476,7 @@
};
};
buildConfigurationList = EFBBC74E1DF99AFA000CE39A /* Build configuration list for PBXProject "IBMCloudAppID" */;
compatibilityVersion = "Xcode 3.2";
compatibilityVersion = "Xcode 9.3";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
Expand Down Expand Up @@ -610,8 +605,8 @@
EFBA205E1E51F7D9000EB3F5 /* StringPreference.swift in Sources */,
EFBA20661E51F7D9000EB3F5 /* IdentityTokenImpl.swift in Sources */,
EFBA20441E51F7D9000EB3F5 /* AppIDConstants.swift in Sources */,
EFBA205C1E51F7D9000EB3F5 /* SecurityUtils.swift in Sources */,
EFBA20461E51F7D9000EB3F5 /* AppIDError.swift in Sources */,
0987DBB8214C5E3600C01812 /* SecurityUtils.swift in Sources */,
EFBA20561E51F7D9000EB3F5 /* PreferenceManager.swift in Sources */,
EFBA206A1E51F7D9000EB3F5 /* Utils.swift in Sources */,
EFBA20501E51F7D9000EB3F5 /* JSONPreference.swift in Sources */,
Expand All @@ -625,6 +620,7 @@
EFBA201E1E51F7D9000EB3F5 /* AppIDTestConstants.swift in Sources */,
EFBA20521E51F7D9000EB3F5 /* LoginWidgetImpl.swift in Sources */,
EFBA204A1E51F7D9000EB3F5 /* AuthorizationManager.swift in Sources */,
0987DBBB2151865D00C01812 /* SecAttrAccessible.swift in Sources */,
EFBA20541E51F7D9000EB3F5 /* OAuthManager.swift in Sources */,
181050421EE1BD9200AAA443 /* TokenResponseDelegate.swift in Sources */,
EFBA20641E51F7D9000EB3F5 /* AccessTokenImpl.swift in Sources */,
Expand Down Expand Up @@ -708,7 +704,10 @@
CODE_SIGN_ENTITLEMENTS = dummyAppForKeyChain/dummyAppForKeyChain.entitlements;
DEVELOPMENT_TEAM = TN6YQNGLXP;
INFOPLIST_FILE = dummyAppForKeyChain/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = oded.dummyAppForKeyChain;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
Expand All @@ -724,7 +723,10 @@
CODE_SIGN_ENTITLEMENTS = dummyAppForKeyChain/dummyAppForKeyChain.entitlements;
DEVELOPMENT_TEAM = TN6YQNGLXP;
INFOPLIST_FILE = dummyAppForKeyChain/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = oded.dummyAppForKeyChain;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
Expand Down Expand Up @@ -840,8 +842,10 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -863,7 +867,11 @@
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = IBMCloudAppIDTests/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "";
PRODUCT_BUNDLE_IDENTIFIER = IBMCloudAppID;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -890,7 +898,11 @@
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = IBMCloudAppIDTests/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MODULEMAP_FILE = "";
PRODUCT_BUNDLE_IDENTIFIER = IBMCloudAppID;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -909,8 +921,12 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
INFOPLIST_FILE = IBMCloudAppIDTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = oded.IBMCloudAppIDTests;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = IBMCloudAppIDTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
Expand All @@ -925,8 +941,12 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
INFOPLIST_FILE = IBMCloudAppIDTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = oded.IBMCloudAppIDTests;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = IBMCloudAppIDTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
Expand Down

0 comments on commit 1b6c8ed

Please sign in to comment.