Skip to content

Commit

Permalink
Merge pull request #116 from okta/iabdullin/mac_os
Browse files Browse the repository at this point in the history
OKTA-279558 - AuthN iOS SDK: Add MacOS support
  • Loading branch information
IldarAbdullin-okta authored Feb 28, 2020
2 parents 94baaa0 + 013d756 commit 2795a6c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 43 deletions.
4 changes: 0 additions & 4 deletions OktaAuthNative.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
A1F9E599229DD7A400924F7A /* MFA_ENROLL_ACTIVATE_TOTP in Resources */ = {isa = PBXBuildFile; fileRef = A1F9E597229DD7A400924F7A /* MFA_ENROLL_ACTIVATE_TOTP */; };
A1F9E59A229DD7A400924F7A /* SUCCESS_UNLOCK in Resources */ = {isa = PBXBuildFile; fileRef = A1F9E598229DD7A400924F7A /* SUCCESS_UNLOCK */; };
A1FCB12F220A458F0026F522 /* OktaAPIMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1FCB12E220A458F0026F522 /* OktaAPIMock.swift */; };
FA4ED9A021C1499200A065A1 /* OktaAuth_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = FA4ED99E21C1499200A065A1 /* OktaAuth_iOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
FA4ED9AA21C2895B00A065A1 /* OktaError.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA4ED9A921C2895B00A065A1 /* OktaError.swift */; };
FA500E4A21C7FCD800444B1D /* OktaAuthNative.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA4ED99B21C1499200A065A1 /* OktaAuthNative.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -232,7 +231,6 @@
A1F9E598229DD7A400924F7A /* SUCCESS_UNLOCK */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SUCCESS_UNLOCK; sourceTree = "<group>"; };
A1FCB12E220A458F0026F522 /* OktaAPIMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OktaAPIMock.swift; sourceTree = "<group>"; };
FA4ED99B21C1499200A065A1 /* OktaAuthNative.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OktaAuthNative.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FA4ED99E21C1499200A065A1 /* OktaAuth_iOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OktaAuth_iOS.h; sourceTree = "<group>"; };
FA4ED99F21C1499200A065A1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
FA4ED9A921C2895B00A065A1 /* OktaError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OktaError.swift; sourceTree = "<group>"; };
FA500E4521C7FCD800444B1D /* OktaAuthNative iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OktaAuthNative iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -481,7 +479,6 @@
FAC5AEDA21C7F6F000C3DC91 /* Supporting Files */ = {
isa = PBXGroup;
children = (
FA4ED99E21C1499200A065A1 /* OktaAuth_iOS.h */,
FA4ED99F21C1499200A065A1 /* Info.plist */,
);
name = "Supporting Files";
Expand All @@ -494,7 +491,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
FA4ED9A021C1499200A065A1 /* OktaAuth_iOS.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,17 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FA4ED99A21C1499200A065A1"
BuildableName = "OktaAuthNative.framework"
BlueprintName = "OktaAuthNative iOS"
ReferencedContainer = "container:OktaAuthNative.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
Expand All @@ -47,19 +56,22 @@
BlueprintName = "OktaAuthNative iOS Tests"
ReferencedContainer = "container:OktaAuthNative.xcodeproj">
</BuildableReference>
<SkippedTests>
<Test
Identifier = "E2ETests/testFactorChallengeSuccess()">
</Test>
<Test
Identifier = "E2ETests/testPushFactorEnrollmentSuccess()">
</Test>
<Test
Identifier = "E2ETests/testSmsFactorEnrollmentSuccess()">
</Test>
<Test
Identifier = "E2ETests/testTotpFactorEnrollmentSuccess()">
</Test>
</SkippedTests>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FA4ED99A21C1499200A065A1"
BuildableName = "OktaAuthNative.framework"
BlueprintName = "OktaAuthNative iOS"
ReferencedContainer = "container:OktaAuthNative.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand Down Expand Up @@ -107,8 +119,6 @@
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
3 changes: 2 additions & 1 deletion OktaAuthSdk.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ Pod::Spec.new do |s|
s.description = <<-DESC
Integrate your native app with Okta.
DESC

s.platforms = { :ios => "10.0", :osx => "10.14"}
s.homepage = 'https://github.com/okta/okta-auth-swift'
s.license = { :type => 'APACHE2', :file => 'LICENSE' }
s.authors = { "Okta Developers" => "[email protected]"}
s.source = { :git => 'https://github.com/okta/okta-auth-swift.git', :tag => s.version.to_s }

s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.14'
s.source_files = 'Source/**/*'
s.swift_version = '4.2'
s.exclude_files = [
Expand Down
23 changes: 0 additions & 23 deletions Source/OktaAuth_iOS.h

This file was deleted.

0 comments on commit 2795a6c

Please sign in to comment.