Add modulemap & fix imports

spotify · Feb 26, 2019 · b54652b · b54652b
1 parent dc6ec7f
commit b54652b
Show file tree

Hide file tree

Showing 16 changed files with 290 additions and 301 deletions.
diff --git a/SPTPersistentCache.xcodeproj/project.pbxproj b/SPTPersistentCache.xcodeproj/project.pbxproj
@@ -64,18 +64,6 @@
 		};
 /* End PBXContainerItemProxy section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		0510FF111BA2FF7A00ED0766 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
 		050076A81C7A2B6D000819B5 /* NSFileManagerMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSFileManagerMock.h; sourceTree = "<group>"; };
 		050076A91C7A2B6D000819B5 /* NSFileManagerMock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSFileManagerMock.m; sourceTree = "<group>"; };
@@ -102,6 +90,8 @@
 		0595F3391C50117B0052328B /* SPTPersistentCacheGarbageCollector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTPersistentCacheGarbageCollector.m; sourceTree = "<group>"; };
 		0595F33B1C5011E30052328B /* SPTPersistentCache+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SPTPersistentCache+Private.h"; sourceTree = "<group>"; };
 		05C0B6531DDF7F9C00DDC99A /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
+		693521E02224C61D0098F8E3 /* SPTPersistentCacheImplementation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPTPersistentCacheImplementation.h; sourceTree = "<group>"; };
+		693521E12224C6240098F8E3 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		696CD7841C4707E20071DD18 /* crc32iso3309.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32iso3309.c; sourceTree = "<group>"; };
 		696CD7851C4707E20071DD18 /* crc32iso3309.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crc32iso3309.h; sourceTree = "<group>"; };
 		696CD7861C4707E20071DD18 /* SPTPersistentCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTPersistentCache.m; sourceTree = "<group>"; };
@@ -137,8 +127,8 @@
 		9C9E70751C78FD9700E1CBE6 /* SPTPersistentCacheObjectDescriptionStyleValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTPersistentCacheObjectDescriptionStyleValidator.m; sourceTree = "<group>"; };
 		C41237071C6A29FB00C1E9B8 /* SPTPersistentCacheGarbageCollectorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTPersistentCacheGarbageCollectorTests.m; sourceTree = "<group>"; };
 		C413BA001C71CBBA002D41FB /* SPTPersistentCacheHeaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTPersistentCacheHeaderTests.m; sourceTree = "<group>"; };
-		C413BA031C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSError+SPTPersistentCacheDomainErrors.h"; path = "Categories/NSError+SPTPersistentCacheDomainErrors.h"; sourceTree = "<group>"; };
-		C413BA041C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSError+SPTPersistentCacheDomainErrors.m"; path = "Categories/NSError+SPTPersistentCacheDomainErrors.m"; sourceTree = "<group>"; };
+		C413BA031C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+SPTPersistentCacheDomainErrors.h"; sourceTree = "<group>"; };
+		C413BA041C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+SPTPersistentCacheDomainErrors.m"; sourceTree = "<group>"; };
 		C413BA061C71E2DC002D41FB /* NSError+SPTPersistentCacheDomainErrorsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+SPTPersistentCacheDomainErrorsTests.m"; sourceTree = "<group>"; };
 		C45526AD1C77D7ED008D5570 /* SPTPersistentCacheTypeUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTPersistentCacheTypeUtilities.h; sourceTree = "<group>"; };
 		C45526AE1C77D7ED008D5570 /* SPTPersistentCacheTypeUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTPersistentCacheTypeUtilities.m; sourceTree = "<group>"; };
@@ -154,13 +144,6 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		0510FF101BA2FF7A00ED0766 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		0510FF1B1BA2FF7A00ED0766 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -259,7 +242,8 @@
 		696CD7831C4707E20071DD18 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				C413BA021C71E0CF002D41FB /* Categories */,
+				C413BA031C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.h */,
+				C413BA041C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.m */,
 				696CD7841C4707E20071DD18 /* crc32iso3309.c */,
 				696CD7851C4707E20071DD18 /* crc32iso3309.h */,
 				696CD7861C4707E20071DD18 /* SPTPersistentCache.m */,
@@ -290,11 +274,13 @@
 		696CD78E1C4707EA0071DD18 /* API */ = {
 			isa = PBXGroup;
 			children = (
+				693521E12224C6240098F8E3 /* module.modulemap */,
 				696CD7911C4707EA0071DD18 /* SPTPersistentCache.h */,
 				696CD7931C4707EA0071DD18 /* SPTPersistentCacheOptions.h */,
 				696CD7941C4707EA0071DD18 /* SPTPersistentCacheHeader.h */,
 				0595F0AA1C50081C0052328B /* SPTPersistentCacheRecord.h */,
 				0595F0B11C5009920052328B /* SPTPersistentCacheResponse.h */,
+				693521E02224C61D0098F8E3 /* SPTPersistentCacheImplementation.h */,
 			);
 			name = API;
 			path = include/SPTPersistentCache;
@@ -324,15 +310,6 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
-		C413BA021C71E0CF002D41FB /* Categories */ = {
-			isa = PBXGroup;
-			children = (
-				C413BA031C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.h */,
-				C413BA041C71E1A0002D41FB /* NSError+SPTPersistentCacheDomainErrors.m */,
-			);
-			name = Categories;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -341,8 +318,6 @@
 			buildConfigurationList = 0510FF271BA2FF7A00ED0766 /* Build configuration list for PBXNativeTarget "SPTPersistentCache" */;
 			buildPhases = (
 				0510FF0F1BA2FF7A00ED0766 /* Sources */,
-				0510FF101BA2FF7A00ED0766 /* Frameworks */,
-				0510FF111BA2FF7A00ED0766 /* CopyFiles */,
 			);
 			buildRules = (
 			);

diff --git a/SPTPersistentCacheFramework/SPTPersistentCacheFramework.xcodeproj/project.pbxproj b/SPTPersistentCacheFramework/SPTPersistentCacheFramework.xcodeproj/project.pbxproj
@@ -154,29 +154,30 @@
 		052021B61C737E3E003A4FB4 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				DD1D238B1C7785A900D0477A /* Categories */,
 				DD1D23901C7785A900D0477A /* crc32iso3309.c */,
 				DD1D23911C7785A900D0477A /* crc32iso3309.h */,
+				DD1D238C1C7785A900D0477A /* NSError+SPTPersistentCacheDomainErrors.h */,
+				DD1D238D1C7785A900D0477A /* NSError+SPTPersistentCacheDomainErrors.m */,
 				DD1D23921C7785A900D0477A /* SPTPersistentCache.m */,
 				DD1D23931C7785A900D0477A /* SPTPersistentCache+Private.h */,
+				C4EA65041C7A547000A6091A /* SPTPersistentCacheDebugUtilities.h */,
+				C4EA65051C7A547000A6091A /* SPTPersistentCacheDebugUtilities.m */,
 				DD1D23941C7785A900D0477A /* SPTPersistentCacheFileManager.h */,
 				DD1D23951C7785A900D0477A /* SPTPersistentCacheFileManager.m */,
+				DD1D239C1C7785A900D0477A /* SPTPersistentCacheGarbageCollector.h */,
+				DD1D239D1C7785A900D0477A /* SPTPersistentCacheGarbageCollector.m */,
 				DD1D23961C7785A900D0477A /* SPTPersistentCacheHeader.m */,
 				9C9E707A1C790F0B00E1CBE6 /* SPTPersistentCacheObjectDescription.h */,
 				9C9E70791C790F0B00E1CBE6 /* SPTPersistentCacheObjectDescription.m */,
 				DD1D23971C7785A900D0477A /* SPTPersistentCacheOptions.m */,
+				050076B11C7A4354000819B5 /* SPTPersistentCachePosixWrapper.h */,
+				050076B21C7A4354000819B5 /* SPTPersistentCachePosixWrapper.m */,
 				DD1D23981C7785A900D0477A /* SPTPersistentCacheRecord.m */,
 				DD1D23991C7785A900D0477A /* SPTPersistentCacheRecord+Private.h */,
 				DD1D239A1C7785A900D0477A /* SPTPersistentCacheResponse.m */,
 				DD1D239B1C7785A900D0477A /* SPTPersistentCacheResponse+Private.h */,
-				DD1D239C1C7785A900D0477A /* SPTPersistentCacheGarbageCollector.h */,
-				DD1D239D1C7785A900D0477A /* SPTPersistentCacheGarbageCollector.m */,
 				C45526B21C77DCCC008D5570 /* SPTPersistentCacheTypeUtilities.h */,
 				C45526B31C77DCCC008D5570 /* SPTPersistentCacheTypeUtilities.m */,
-				C4EA65041C7A547000A6091A /* SPTPersistentCacheDebugUtilities.h */,
-				C4EA65051C7A547000A6091A /* SPTPersistentCacheDebugUtilities.m */,
-				050076B11C7A4354000819B5 /* SPTPersistentCachePosixWrapper.h */,
-				050076B21C7A4354000819B5 /* SPTPersistentCachePosixWrapper.m */,
 			);
 			name = Sources;
 			path = ../Sources;
@@ -192,15 +193,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		DD1D238B1C7785A900D0477A /* Categories */ = {
-			isa = PBXGroup;
-			children = (
-				DD1D238C1C7785A900D0477A /* NSError+SPTPersistentCacheDomainErrors.h */,
-				DD1D238D1C7785A900D0477A /* NSError+SPTPersistentCacheDomainErrors.m */,
-			);
-			path = Categories;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */

diff --git a/.../NSError+SPTPersistentCacheDomainErrors.h → .../NSError+SPTPersistentCacheDomainErrors.h b/.../NSError+SPTPersistentCacheDomainErrors.h → .../NSError+SPTPersistentCacheDomainErrors.h
@@ -20,7 +20,7 @@
  */
 #import <Foundation/Foundation.h>
 
-#import <SPTPersistentCache/SPTPersistentCache.h>
+#import <SPTPersistentCache/SPTPersistentCacheImplementation.h>
 
 /**
  Category to instantiate NSError objects with a specific domain for SPTPersistentCache.

diff --git a/.../NSError+SPTPersistentCacheDomainErrors.m → .../NSError+SPTPersistentCacheDomainErrors.m b/.../NSError+SPTPersistentCacheDomainErrors.m → .../NSError+SPTPersistentCacheDomainErrors.m
diff --git a/Sources/SPTPersistentCache+Private.h b/Sources/SPTPersistentCache+Private.h
@@ -19,7 +19,9 @@
  under the License.
  */
 
-#import <SPTPersistentCache/SPTPersistentCache.h>
+#import <SPTPersistentCache/SPTPersistentCacheImplementation.h>
+#import <SPTPersistentCache/SPTPersistentCacheResponse.h>
+#import <SPTPersistentCache/SPTPersistentCacheOptions.h>
 
 @class SPTPersistentCacheFileManager;
 @class SPTPersistentCacheGarbageCollector;

diff --git a/Sources/SPTPersistentCache.m b/Sources/SPTPersistentCache.m
@@ -20,6 +20,9 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 #import "SPTPersistentCache+Private.h"
 
+#import <SPTPersistentCache/SPTPersistentCacheImplementation.h>
+#import <SPTPersistentCache/SPTPersistentCacheResponse.h>
+#import <SPTPersistentCache/SPTPersistentCacheOptions.h>
 #import <SPTPersistentCache/SPTPersistentCacheHeader.h>
 
 #import "SPTPersistentCacheRecord+Private.h"

diff --git a/Sources/SPTPersistentCacheFileManager.m b/Sources/SPTPersistentCacheFileManager.m
@@ -20,7 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 #import "SPTPersistentCacheFileManager+Private.h"
 #import "SPTPersistentCacheDebugUtilities.h"
-#import "SPTPersistentCacheOptions.h"
+#import <SPTPersistentCache/SPTPersistentCacheOptions.h>
 
 static const double SPTPersistentCacheFileManagerMinFreeDiskSpace = 0.1;
 

diff --git a/Sources/SPTPersistentCacheOptions.m b/Sources/SPTPersistentCacheOptions.m
@@ -18,7 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  specific language governing permissions and limitations
  under the License.
  */
-#import "SPTPersistentCacheOptions.h"
+#import <SPTPersistentCache/SPTPersistentCacheOptions.h>
 #import "SPTPersistentCacheObjectDescription.h"
 #import "SPTPersistentCacheDebugUtilities.h"
 
@@ -156,7 +156,7 @@ - (NSString *)debugDescription
 @end
 
 
-@implementation SPTPersistentCacheOptions (Deprectated)
+@implementation SPTPersistentCacheOptions (Deprecated)
 
 - (instancetype)initWithCachePath:(NSString *)cachePath
                        identifier:(NSString *)cacheIdentifier

diff --git a/Sources/SPTPersistentCacheRecord+Private.h b/Sources/SPTPersistentCacheRecord+Private.h
@@ -18,7 +18,7 @@
  specific language governing permissions and limitations
  under the License.
  */
-#import "SPTPersistentCacheRecord.h"
+#import <SPTPersistentCache/SPTPersistentCacheRecord.h>
 
 @interface SPTPersistentCacheRecord (Private)
 

diff --git a/Sources/SPTPersistentCacheRecord.m b/Sources/SPTPersistentCacheRecord.m
@@ -18,7 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  specific language governing permissions and limitations
  under the License.
  */
-#import "SPTPersistentCacheRecord.h"
+#import <SPTPersistentCache/SPTPersistentCacheRecord.h>
 #import "SPTPersistentCacheObjectDescription.h"
 
 @implementation SPTPersistentCacheRecord

diff --git a/Tests/SPTPersistentCacheHeaderTests.m b/Tests/SPTPersistentCacheHeaderTests.m
@@ -20,7 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 #import <XCTest/XCTest.h>
 
-#import "SPTPersistentCacheHeader.h"
+#import <SPTPersistentCache/SPTPersistentCacheHeader.h>
 #import <SPTPersistentCache/SPTPersistentCache.h>
 #import "SPTPersistentCacheTypeUtilities.h"
 

diff --git a/Tests/SPTPersistentCacheRecordTests.m b/Tests/SPTPersistentCacheRecordTests.m
@@ -20,7 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one
  */
 
 #import <XCTest/XCTest.h>
-#import "SPTPersistentCacheRecord.h"
+#import <SPTPersistentCache/SPTPersistentCacheRecord.h>
 #import "SPTPersistentCacheRecord+Private.h"
 #import "SPTPersistentCacheObjectDescriptionStyleValidator.h"