Merge pull request #870 from SRGSSR/spm

Swift Package Manager support

Mantle.podspec.json

@@ -19,12 +19,12 @@
  },
  "requires_arc": true,
  "frameworks": "Foundation",
- "source_files": "Mantle",
+ "source_files": ["Mantle", "Mantle/include"],
  "subspecs": [
  {
  "name": "extobjc",
- "source_files": "Mantle/extobjc",
- "private_header_files": "Mantle/extobjc/*.h"
+ "source_files": ["Mantle/extobjc", "Mantle/extobjc/include/*.h"],
+ "private_header_files": "Mantle/extobjc/include/*.h"
  }
  ]
 }

Mantle/MTLJSONAdapter.m

@@ -10,8 +10,8 @@
 
 #import "NSDictionary+MTLJSONKeyPath.h"
 
-#import <Mantle/EXTRuntimeExtensions.h>
-#import <Mantle/EXTScope.h>
+#import "EXTRuntimeExtensions.h"
+#import "EXTScope.h"
 #import "MTLJSONAdapter.h"
 #import "MTLModel.h"
 #import "MTLTransformerErrorHandling.h"

Mantle/MTLModel+NSCoding.m

@@ -6,9 +6,9 @@
 // Copyright (c) 2013 GitHub. All rights reserved.
 //
 
+#import "EXTRuntimeExtensions.h"
+#import "EXTScope.h"
 #import "MTLModel+NSCoding.h"
-#import <Mantle/EXTRuntimeExtensions.h>
-#import <Mantle/EXTScope.h>
 #import "MTLReflection.h"
 
 // Used in archives to store the modelVersion of the archived instance.

Mantle/MTLModel.m

@@ -6,10 +6,10 @@
 // Copyright (c) 2012 GitHub. All rights reserved.
 //
 
+#import "EXTRuntimeExtensions.h"
+#import "EXTScope.h"
 #import "NSError+MTLModelException.h"
 #import "MTLModel.h"
-#import <Mantle/EXTRuntimeExtensions.h>
-#import <Mantle/EXTScope.h>
 #import "MTLReflection.h"
 #import <objc/runtime.h>
 

Mantle/MTLModel+NSCoding.h → Mantle/include/MTLModel+NSCoding.h

@@ -6,7 +6,11 @@
 // Copyright (c) 2013 GitHub. All rights reserved.
 //
 
+#if __has_include(<Mantle/MTLModel.h>)
+#import <Mantle/MTLModel.h>
+#else
 #import "MTLModel.h"
+#endif
 
 /// Defines how a MTLModel property key should be encoded into an archive.
 ///

Mantle/MTLValueTransformer.h → Mantle/include/MTLValueTransformer.h

@@ -8,7 +8,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if __has_include(<Mantle/MTLTransformerErrorHandling.h>)
+#import <Mantle/MTLTransformerErrorHandling.h>
+#else
 #import "MTLTransformerErrorHandling.h"
+#endif
 
 /// A block that represents a transformation.
 ///

Mantle/Mantle.h → Mantle/include/Mantle.h

@@ -14,6 +14,7 @@ FOUNDATION_EXPORT double MantleVersionNumber;
 //! Project version string for Mantle.
 FOUNDATION_EXPORT const unsigned char MantleVersionString[];
 
+#if __has_include(<Mantle/Mantle.h>)
 #import <Mantle/MTLJSONAdapter.h>
 #import <Mantle/MTLModel.h>
 #import <Mantle/MTLModel+NSCoding.h>
@@ -25,3 +26,16 @@ FOUNDATION_EXPORT const unsigned char MantleVersionString[];
 #import <Mantle/NSObject+MTLComparisonAdditions.h>
 #import <Mantle/NSValueTransformer+MTLInversionAdditions.h>
 #import <Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h>
+#else
+#import "MTLJSONAdapter.h"
+#import "MTLModel.h"
+#import "MTLModel+NSCoding.h"
+#import "MTLValueTransformer.h"
+#import "MTLTransformerErrorHandling.h"
+#import "NSArray+MTLManipulationAdditions.h"
+#import "NSDictionary+MTLManipulationAdditions.h"
+#import "NSDictionary+MTLMappingAdditions.h"
+#import "NSObject+MTLComparisonAdditions.h"
+#import "NSValueTransformer+MTLInversionAdditions.h"
+#import "NSValueTransformer+MTLPredefinedTransformerAdditions.h"
+#endif

Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h → Mantle/include/NSValueTransformer+MTLPredefinedTransformerAdditions.h

@@ -8,7 +8,11 @@
 
 #import <Foundation/Foundation.h>
 
+#if __has_include(<Mantle/MTLTransformerErrorHandling.h>)
+#import <Mantle/MTLTransformerErrorHandling.h>
+#else
 #import "MTLTransformerErrorHandling.h"
+#endif
 
 /// The name for a value transformer that converts strings into URLs and back.
 extern NSString * const MTLURLValueTransformerName;

Package.swift

@@ -0,0 +1,31 @@
+// swift-tools-version:5.1
+
+import PackageDescription
+
+let package = Package(
+ name: "Mantle",
+ platforms: [
+ .macOS(.v10_10),
+ .iOS(.v8),
+ .tvOS(.v9),
+ .watchOS(.v2)
+ ],
+ products: [
+ .library(
+ name: "Mantle",
+ targets: ["Mantle"]
+ )
+ ],
+ targets: [
+ .target(
+ name: "Mantle",
+ dependencies: ["extobjc"],
+ path: "Mantle",
+ exclude: ["extobjc"]
+ ),
+ .target(
+ name: "extobjc",
+ path: "Mantle/extobjc"
+ )
+ ]
+)

README.md

@@ -2,6 +2,7 @@
 
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/Mantle.svg)](https://img.shields.io/cocoapods/v/Mantle.svg)
+[![SPM compatible](https://img.shields.io/badge/SPM-compatible-4BC51D.svg?style=flat)](https://swift.org/package-manager)
 [![Platform](https://img.shields.io/cocoapods/p/Mantle.svg?style=flat)](http://cocoadocs.org/docsets/Mantle)
 
 Mantle makes it easy to write a simple model layer for your Cocoa or Cocoa Touch application.
@@ -515,7 +516,17 @@ end
 
 Then run a `pod install` within Terminal or the [CocoaPods app](https://cocoapods.org/app).
 
+### [Swift Package Manager](https://swift.org/package-manager)
 
+If you are writing an application, add Mantle to your project dependencies [directly within Xcode](https://developer.apple.com/documentation/xcode/adding_package_dependencies_to_your_app).
+
+If you are writing a package that requires Mantle as dependency, add it to the `dependencies` list in its `Package.swift` manifest, for example:
+
+```
+dependencies: [
+ .package(url: "https://github.com/Mantle/Mantle.git", .upToNextMajor(from: "2.0.0"))
+]
+```
 
 ## License