Skip to content

Commit 07944e2

Browse files
IldarAbdullin-oktaIldarAbdullin-okta
authored
Merge pull request #30 from okta/dev
OKTA-242002-JWT iOS SDK: Add Carthage support
2 parents 8d38a8e + e2f2686 commit 07944e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1054
-644
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
language: objective-c
2-
osx_image: xcode10
3-
4-
podfile: Example/Podfile
5-
xcode_workspace: Example/OktaJWT.xcworkspace
6-
xcode_scheme: OktaJWT-Example
7-
xcode_destination: platform=iOS Simulator,name=iPhone 8,OS=latest
2+
osx_image: xcode10.1
3+
xcode_project: OktaJWT.xcodeproj
4+
xcode_scheme: OktaJWT
5+
xcode_destination: platform=iOS Simulator,OS=latest,name=iPhone 8

‎Example/OktaJWT.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 592 deletions
This file was deleted.

‎Example/Podfile‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Framework/Info.plist‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>2.0.1</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
</dict>
22+
</plist>

‎Framework/OktaJWTLib.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright (c) 2019, Okta, Inc. and/or its affiliates. All rights reserved.
3+
* The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
4+
*
5+
* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
6+
* Unless required by applicable law or agreed to in writing, software
7+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
8+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9+
*
10+
* See the License for the specific language governing permissions and limitations under the License.
11+
*/
12+
13+
#import <UIKit/UIKit.h>
14+
15+
//! Project version number for OktaJWTLib.
16+
FOUNDATION_EXPORT double OktaJWTLibVersionNumber;
17+
18+
//! Project version string for OktaJWTLib.
19+
FOUNDATION_EXPORT const unsigned char OktaJWTLibVersionString[];
20+
21+
#import <OktaJWTLib/NSData+SHA.h>
22+
#import <OktaJWTLib/NSData+HMAC.h>
23+
24+

‎OktaJWT.podspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'OktaJWT'
3-
s.version = '2.0.0'
3+
s.version = '2.0.1'
44
s.summary = 'A JWT verification library'
55

66
s.description = <<-DESC
@@ -15,5 +15,6 @@ Library to validate JSON Web Tokens.
1515

1616
s.ios.deployment_target = '9.0'
1717

18-
s.source_files = 'OktaJWT/**/*.{h,m,swift}'
18+
s.source_files = 'Sources/**/*.{h,m,swift}'
19+
s.swift_version = '4.2'
1920
end

‎OktaJWT.xcodeproj/project.pbxproj‎

Lines changed: 861 additions & 0 deletions
Large diffs are not rendered by default.

Example/OktaJWT.xcodeproj/xcshareddata/xcschemes/OktaJWT-Example.xcscheme renamed to OktaJWT.xcodeproj/xcshareddata/xcschemes/OktaJWT.xcscheme

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
18-
BuildableName = "OktaJWT_Example.app"
19-
BlueprintName = "OktaJWT_Example"
20-
ReferencedContainer = "container:OktaJWT.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "607FACE41AFB9204008FA782"
32-
BuildableName = "OktaJWT_Tests.xctest"
33-
BlueprintName = "OktaJWT_Tests"
17+
BlueprintIdentifier = "A121D21B22FA090E006C1839"
18+
BuildableName = "OktaJWT.app"
19+
BlueprintName = "OktaJWT"
3420
ReferencedContainer = "container:OktaJWT.xcodeproj">
3521
</BuildableReference>
3622
</BuildActionEntry>
@@ -46,19 +32,19 @@
4632
skipped = "NO">
4733
<BuildableReference
4834
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "607FACE41AFB9204008FA782"
50-
BuildableName = "OktaJWT_Tests.xctest"
51-
BlueprintName = "OktaJWT_Tests"
35+
BlueprintIdentifier = "A121D22F22FA0913006C1839"
36+
BuildableName = "OktaJWTTests.xctest"
37+
BlueprintName = "OktaJWTTests"
5238
ReferencedContainer = "container:OktaJWT.xcodeproj">
5339
</BuildableReference>
5440
</TestableReference>
5541
</Testables>
5642
<MacroExpansion>
5743
<BuildableReference
5844
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
60-
BuildableName = "OktaJWT_Example.app"
61-
BlueprintName = "OktaJWT_Example"
45+
BlueprintIdentifier = "A121D21B22FA090E006C1839"
46+
BuildableName = "OktaJWT.app"
47+
BlueprintName = "OktaJWT"
6248
ReferencedContainer = "container:OktaJWT.xcodeproj">
6349
</BuildableReference>
6450
</MacroExpansion>
@@ -79,9 +65,9 @@
7965
runnableDebuggingMode = "0">
8066
<BuildableReference
8167
BuildableIdentifier = "primary"
82-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
83-
BuildableName = "OktaJWT_Example.app"
84-
BlueprintName = "OktaJWT_Example"
68+
BlueprintIdentifier = "A121D21B22FA090E006C1839"
69+
BuildableName = "OktaJWT.app"
70+
BlueprintName = "OktaJWT"
8571
ReferencedContainer = "container:OktaJWT.xcodeproj">
8672
</BuildableReference>
8773
</BuildableProductRunnable>
@@ -98,9 +84,9 @@
9884
runnableDebuggingMode = "0">
9985
<BuildableReference
10086
BuildableIdentifier = "primary"
101-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
102-
BuildableName = "OktaJWT_Example.app"
103-
BlueprintName = "OktaJWT_Example"
87+
BlueprintIdentifier = "A121D21B22FA090E006C1839"
88+
BuildableName = "OktaJWT.app"
89+
BlueprintName = "OktaJWT"
10490
ReferencedContainer = "container:OktaJWT.xcodeproj">
10591
</BuildableReference>
10692
</BuildableProductRunnable>

‎OktaJWT.xcodeproj/xcshareddata/xcschemes/OktaJWTLib.xcscheme‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "A12607A722FA16BA007AE25E"
18+
BuildableName = "OktaJWTLib.framework"
19+
BlueprintName = "OktaJWTLib"
20+
ReferencedContainer = "container:OktaJWT.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "A12607A722FA16BA007AE25E"
49+
BuildableName = "OktaJWTLib.framework"
50+
BlueprintName = "OktaJWTLib"
51+
ReferencedContainer = "container:OktaJWT.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "A12607A722FA16BA007AE25E"
67+
BuildableName = "OktaJWTLib.framework"
68+
BlueprintName = "OktaJWTLib"
69+
ReferencedContainer = "container:OktaJWT.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎README.md‎

Lines changed: 12 additions & 0 deletions

0 commit comments

Comments
 (0)