Skip to content

Commit 633cbea

Browse files
Merge pull request tristanhimmelman#1097 from openium/master
Swift 5 and package manager support to be able to SPM AlamofireObjectMapper
2 parents c3696dc + 7ac4d69 commit 633cbea

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

ObjectMapper.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@
139139
997B4A481D3FA20D005E3F31 /* DictionaryTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 997B4A461D3FA20D005E3F31 /* DictionaryTransform.swift */; };
140140
997B4A491D3FA20D005E3F31 /* DictionaryTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 997B4A461D3FA20D005E3F31 /* DictionaryTransform.swift */; };
141141
997B4A4A1D3FA20D005E3F31 /* DictionaryTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 997B4A461D3FA20D005E3F31 /* DictionaryTransform.swift */; };
142+
BA9D143C246BF0930037233E /* URLTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1865416E1E972FA800F95A19 /* URLTransformTests.swift */; };
143+
BA9D143D246BF0940037233E /* URLTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1865416E1E972FA800F95A19 /* URLTransformTests.swift */; };
142144
BC1E7F371ABC44C000F9B1CF /* EnumTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC1E7F361ABC44C000F9B1CF /* EnumTransform.swift */; };
143145
C135CAB41D762F6900BA9338 /* DataTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = C135CAB31D762F6900BA9338 /* DataTransform.swift */; };
144146
C135CAB71D76303E00BA9338 /* DataTransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C135CAB61D76303E00BA9338 /* DataTransformTests.swift */; };
@@ -872,6 +874,7 @@
872874
6AA1F66C1BE94687006EF513 /* PerformanceTests.swift in Sources */,
873875
491D7997216FB8B2006DB931 /* CodableTests.swift in Sources */,
874876
6AC692411BE3FD45004C119A /* BasicTypes.swift in Sources */,
877+
BA9D143D246BF0940037233E /* URLTransformTests.swift in Sources */,
875878
6A0BF2011C0B53470083D1AF /* ToObjectTests.swift in Sources */,
876879
84D4F8591CC3B71B008B0FB6 /* NSDecimalNumberTransformTests.swift in Sources */,
877880
6AC692421BE3FD45004C119A /* BasicTypesTestsFromJSON.swift in Sources */,
@@ -1022,6 +1025,7 @@
10221025
6A412A181BAC830B001C3F67 /* ClassClusterTests.swift in Sources */,
10231026
491D7996216FB8B2006DB931 /* CodableTests.swift in Sources */,
10241027
CD1603261AC02480000CD69A /* BasicTypesTestsFromJSON.swift in Sources */,
1028+
BA9D143C246BF0930037233E /* URLTransformTests.swift in Sources */,
10251029
6A0BF2001C0B53470083D1AF /* ToObjectTests.swift in Sources */,
10261030
84D4F8581CC3B71B008B0FB6 /* NSDecimalNumberTransformTests.swift in Sources */,
10271031
CD1603291AC02480000CD69A /* NestedKeysTests.swift in Sources */,

Package.swift

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
// swift-tools-version:5.0
2+
13
import PackageDescription
24

3-
let package = Package(
4-
name: "ObjectMapper",
5-
targets: [
6-
.target(
7-
name: "ObjectMapper",
8-
path: "Sources"
9-
)
10-
],
11-
)
5+
let package = Package(name: "ObjectMapper",
6+
platforms: [.macOS(.v10_10),
7+
.iOS(.v8),
8+
.tvOS(.v9),
9+
.watchOS(.v2)],
10+
products: [.library(name: "ObjectMapper",
11+
targets: ["ObjectMapper"])],
12+
targets: [.target(name: "ObjectMapper",
13+
path: "Sources"),
14+
.testTarget(name: "ObjectMapperTests",
15+
dependencies: ["ObjectMapper"],
16+
path: "Tests")],
17+
swiftLanguageVersions: [.v5])

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ github "tristanhimmelman/ObjectMapper" ~> 3.5 (check releases to make sure this
485485
To add ObjectMapper to a [Swift Package Manager](https://swift.org/package-manager/) based project, add:
486486

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

0 commit comments

Comments
 (0)