Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 5 and package manager support to be able to SPM AlamofireObjectMapper #1097

Merged
merged 3 commits into from
May 18, 2020
Merged

Swift 5 and package manager support to be able to SPM AlamofireObjectMapper #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aab4552
Remove symlink added to make SPM happy and improve Package.swift
kenji21 May 13, 2020
6f27300
Add URLTransformTests to macOS and tvOS test targets
kenji21 May 13, 2020
7ac4d69
Update SPM line in README
kenji21 May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ObjectMapper.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@
997B4A481D3FA20D005E3F31 /* DictionaryTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 997B4A461D3FA20D005E3F31 /* DictionaryTransform.swift */; };
997B4A491D3FA20D005E3F31 /* DictionaryTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 997B4A461D3FA20D005E3F31 /* DictionaryTransform.swift */; };
997B4A4A1D3FA20D005E3F31 /* DictionaryTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 997B4A461D3FA20D005E3F31 /* DictionaryTransform.swift */; };
BA9D143C246BF0930037233E /* URLTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1865416E1E972FA800F95A19 /* URLTransformTests.swift */; };
BA9D143D246BF0940037233E /* URLTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1865416E1E972FA800F95A19 /* URLTransformTests.swift */; };
BC1E7F371ABC44C000F9B1CF /* EnumTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1E7F361ABC44C000F9B1CF /* EnumTransform.swift */; };
C135CAB41D762F6900BA9338 /* DataTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = C135CAB31D762F6900BA9338 /* DataTransform.swift */; };
C135CAB71D76303E00BA9338 /* DataTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C135CAB61D76303E00BA9338 /* DataTransformTests.swift */; };
Expand Down Expand Up @@ -872,6 +874,7 @@
6AA1F66C1BE94687006EF513 /* PerformanceTests.swift in Sources */,
491D7997216FB8B2006DB931 /* CodableTests.swift in Sources */,
6AC692411BE3FD45004C119A /* BasicTypes.swift in Sources */,
BA9D143D246BF0940037233E /* URLTransformTests.swift in Sources */,
6A0BF2011C0B53470083D1AF /* ToObjectTests.swift in Sources */,
84D4F8591CC3B71B008B0FB6 /* NSDecimalNumberTransformTests.swift in Sources */,
6AC692421BE3FD45004C119A /* BasicTypesTestsFromJSON.swift in Sources */,
Expand Down Expand Up @@ -1022,6 +1025,7 @@
6A412A181BAC830B001C3F67 /* ClassClusterTests.swift in Sources */,
491D7996216FB8B2006DB931 /* CodableTests.swift in Sources */,
CD1603261AC02480000CD69A /* BasicTypesTestsFromJSON.swift in Sources */,
BA9D143C246BF0930037233E /* URLTransformTests.swift in Sources */,
6A0BF2001C0B53470083D1AF /* ToObjectTests.swift in Sources */,
84D4F8581CC3B71B008B0FB6 /* NSDecimalNumberTransformTests.swift in Sources */,
CD1603291AC02480000CD69A /* NestedKeysTests.swift in Sources */,
Expand Down
24 changes: 15 additions & 9 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
// swift-tools-version:5.0

import PackageDescription

let package = Package(
name: "ObjectMapper",
targets: [
.target(
name: "ObjectMapper",
path: "Sources"
)
],
)
let package = Package(name: "ObjectMapper",
platforms: [.macOS(.v10_10),
.iOS(.v8),
.tvOS(.v9),
.watchOS(.v2)],
products: [.library(name: "ObjectMapper",
targets: ["ObjectMapper"])],
targets: [.target(name: "ObjectMapper",
path: "Sources"),
.testTarget(name: "ObjectMapperTests",
dependencies: ["ObjectMapper"],
path: "Tests")],
swiftLanguageVersions: [.v5])
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ github "tristanhimmelman/ObjectMapper" ~> 3.5 (check releases to make sure this
To add ObjectMapper to a [Swift Package Manager](https://swift.org/package-manager/) based project, add:

```swift
.Package(url: "https://github.com/tristanhimmelman/ObjectMapper.git", majorVersion: 3, minor: 4),
.package(url: "https://github.com/tristanhimmelman/ObjectMapper.git", .upToNextMajor(from: "4.1.0")),
```
to your `Package.swift` files `dependencies` array.

Expand Down