refactor: Move JWT sources to JWT module

baller784 · Oct 12, 2017 · 7be4e46 · 7be4e46
1 parent b20ecac
commit 7be4e46
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 15 deletions.
diff --git a/JSONWebToken.podspec b/JSONWebToken.podspec
@@ -6,14 +6,14 @@ Pod::Spec.new do |spec|
   spec.license = { :type => 'BSD', :file => 'LICENSE' }
   spec.author = { 'Kyle Fuller' => 'kyle@fuller.li' }
   spec.source = { :git => 'https://github.com/kylef/JSONWebToken.swift.git', :tag => "#{spec.version}" }
-  spec.source_files = 'Sources/*.swift'
+  spec.source_files = 'Sources/JWT/*.swift'
   spec.ios.deployment_target = '8.0'
   spec.osx.deployment_target = '10.9'
   spec.tvos.deployment_target = '9.0'
   spec.watchos.deployment_target = '2.0'
   spec.requires_arc = true
   spec.module_name = 'JWT'
-  spec.exclude_files = ['Sources/HMACCryptoSwift.swift']
+  spec.exclude_files = ['Sources/JWT/HMACCryptoSwift.swift']
 
   if ARGV.include?('lint')
     spec.pod_target_xcconfig = {

diff --git a/JWT.xcodeproj/project.pbxproj b/JWT.xcodeproj/project.pbxproj
@@ -133,6 +133,24 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		271E10861F902D8900B5033C /* JWT */ = {
+			isa = PBXGroup;
+			children = (
+				277794041DF221F800573F3E /* ClaimSet.swift */,
+				2777940A1DF22BE400573F3E /* JOSEHeader.swift */,
+				520A71131C469F010005C709 /* Base64.swift */,
+				520A71141C469F010005C709 /* Claims.swift */,
+				520A71151C469F010005C709 /* Decode.swift */,
+				2777940F1DF22D0D00573F3E /* Encode.swift */,
+				520A71161C469F010005C709 /* JWT.swift */,
+				271E107F1F90253300B5033C /* JWA.swift */,
+				273010FE1F33EABA00219C35 /* HMAC.swift */,
+				273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */,
+				273011091F33FC9100219C35 /* HMACCryptoSwift.swift */,
+			);
+			path = JWT;
+			sourceTree = "<group>";
+		};
 		279D63921AD07FFF0024E2BC = {
 			isa = PBXGroup;
 			children = (
@@ -199,17 +217,7 @@
 		520A71121C469F010005C709 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				277794041DF221F800573F3E /* ClaimSet.swift */,
-				2777940A1DF22BE400573F3E /* JOSEHeader.swift */,
-				520A71131C469F010005C709 /* Base64.swift */,
-				520A71141C469F010005C709 /* Claims.swift */,
-				520A71151C469F010005C709 /* Decode.swift */,
-				2777940F1DF22D0D00573F3E /* Encode.swift */,
-				520A71161C469F010005C709 /* JWT.swift */,
-				271E107F1F90253300B5033C /* JWA.swift */,
-				273010FE1F33EABA00219C35 /* HMAC.swift */,
-				273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */,
-				273011091F33FC9100219C35 /* HMACCryptoSwift.swift */,
+				271E10861F902D8900B5033C /* JWT */,
 			);
 			path = Sources;
 			sourceTree = "<group>";

diff --git a/Package.swift b/Package.swift
@@ -8,7 +8,7 @@ let package = Package(
     .Package(url: "https://github.com/kylef-archive/CommonCrypto.git", majorVersion: 1),
   ],
   exclude: [
-    "Sources/HMACCryptoSwift.swift",
+    "Sources/JWT/HMACCryptoSwift.swift",
   ]
 )
 #else
@@ -18,7 +18,7 @@ let package = Package(
     .Package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", majorVersion: 0, minor: 6),
   ],
   exclude: [
-    "Sources/HMACCommonCrypto.swift",
+    "Sources/JWT/HMACCommonCrypto.swift",
   ]
 )
 #endif
diff --git a/Sources/Base64.swift → Sources/JWT/Base64.swift b/Sources/Base64.swift → Sources/JWT/Base64.swift
diff --git a/Sources/ClaimSet.swift → Sources/JWT/ClaimSet.swift b/Sources/ClaimSet.swift → Sources/JWT/ClaimSet.swift
diff --git a/Sources/Claims.swift → Sources/JWT/Claims.swift b/Sources/Claims.swift → Sources/JWT/Claims.swift
diff --git a/Sources/Decode.swift → Sources/JWT/Decode.swift b/Sources/Decode.swift → Sources/JWT/Decode.swift
diff --git a/Sources/Encode.swift → Sources/JWT/Encode.swift b/Sources/Encode.swift → Sources/JWT/Encode.swift
diff --git a/Sources/HMAC.swift → Sources/JWT/HMAC.swift b/Sources/HMAC.swift → Sources/JWT/HMAC.swift
diff --git a/Sources/HMACCommonCrypto.swift → Sources/JWT/HMACCommonCrypto.swift b/Sources/HMACCommonCrypto.swift → Sources/JWT/HMACCommonCrypto.swift
diff --git a/Sources/HMACCryptoSwift.swift → Sources/JWT/HMACCryptoSwift.swift b/Sources/HMACCryptoSwift.swift → Sources/JWT/HMACCryptoSwift.swift
diff --git a/Sources/JOSEHeader.swift → Sources/JWT/JOSEHeader.swift b/Sources/JOSEHeader.swift → Sources/JWT/JOSEHeader.swift
diff --git a/Sources/JWA.swift → Sources/JWT/JWA.swift b/Sources/JWA.swift → Sources/JWT/JWA.swift
@@ -1,3 +1,5 @@
+import Foundation
+
 /// Represents a JSON Web Algorithm (JWA)
 /// https://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40
 public enum Algorithm: CustomStringConvertible {

diff --git a/Sources/JWT.swift → Sources/JWT/JWT.swift b/Sources/JWT.swift → Sources/JWT/JWT.swift