Skip to content

Commit 880ea1f

Browse files
emrcftciemrcftci
committed
fix(*): Revert unwanted commits
 - Revert accidently created commit from another pull-request -> tristanhimmelman#1081
1 parent fd1f2f6 commit 880ea1f

File tree

6 files changed

+43
-33
lines changed

6 files changed

+43
-33
lines changed

‎ObjectMapper.xcodeproj/project.pbxproj

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -728,11 +728,11 @@
728728
};
729729
6AAC8F7519F03C2900E7A677 = {
730730
CreatedOnToolsVersion = 6.0.1;
731-
LastSwiftMigration = 1120;
731+
LastSwiftMigration = 0900;
732732
};
733733
6AAC8F8019F03C2900E7A677 = {
734734
CreatedOnToolsVersion = 6.0.1;
735-
LastSwiftMigration = 1120;
735+
LastSwiftMigration = 0900;
736736
};
737737
CD1602FE1AC023D5000CD69A = {
738738
CreatedOnToolsVersion = 6.2;
@@ -1108,7 +1108,7 @@
11081108
PRODUCT_NAME = "$(PROJECT_NAME)";
11091109
SDKROOT = appletvos;
11101110
SKIP_INSTALL = YES;
1111-
SWIFT_VERSION = 5.0;
1111+
SWIFT_VERSION = 4.2;
11121112
TARGETED_DEVICE_FAMILY = 3;
11131113
TVOS_DEPLOYMENT_TARGET = 9.0;
11141114
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1137,7 +1137,7 @@
11371137
PRODUCT_NAME = "$(PROJECT_NAME)";
11381138
SDKROOT = appletvos;
11391139
SKIP_INSTALL = YES;
1140-
SWIFT_VERSION = 5.0;
1140+
SWIFT_VERSION = 4.2;
11411141
TARGETED_DEVICE_FAMILY = 3;
11421142
TVOS_DEPLOYMENT_TARGET = 9.0;
11431143
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1156,7 +1156,7 @@
11561156
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.ObjectMapper-tvOSTests";
11571157
PRODUCT_NAME = "$(TARGET_NAME)";
11581158
SDKROOT = appletvos;
1159-
SWIFT_VERSION = 5.0;
1159+
SWIFT_VERSION = 4.2;
11601160
TVOS_DEPLOYMENT_TARGET = 9.0;
11611161
};
11621162
name = Debug;
@@ -1174,7 +1174,7 @@
11741174
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.ObjectMapper-tvOSTests";
11751175
PRODUCT_NAME = "$(TARGET_NAME)";
11761176
SDKROOT = appletvos;
1177-
SWIFT_VERSION = 5.0;
1177+
SWIFT_VERSION = 4.2;
11781178
TVOS_DEPLOYMENT_TARGET = 9.0;
11791179
};
11801180
name = Release;
@@ -1200,7 +1200,7 @@
12001200
PRODUCT_NAME = "$(PROJECT_NAME)";
12011201
SDKROOT = watchos;
12021202
SKIP_INSTALL = YES;
1203-
SWIFT_VERSION = 5.0;
1203+
SWIFT_VERSION = 4.2;
12041204
TARGETED_DEVICE_FAMILY = 4;
12051205
TVOS_DEPLOYMENT_TARGET = 9.0;
12061206
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1228,7 +1228,7 @@
12281228
PRODUCT_NAME = "$(PROJECT_NAME)";
12291229
SDKROOT = watchos;
12301230
SKIP_INSTALL = YES;
1231-
SWIFT_VERSION = 5.0;
1231+
SWIFT_VERSION = 4.2;
12321232
TARGETED_DEVICE_FAMILY = 4;
12331233
TVOS_DEPLOYMENT_TARGET = 9.0;
12341234
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1363,7 +1363,8 @@
13631363
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
13641364
PRODUCT_NAME = "$(PROJECT_NAME)";
13651365
SKIP_INSTALL = YES;
1366-
SWIFT_VERSION = 5.0;
1366+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1367+
SWIFT_VERSION = 4.2;
13671368
TVOS_DEPLOYMENT_TARGET = 9.0;
13681369
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13691370
};
@@ -1384,7 +1385,8 @@
13841385
PRODUCT_BUNDLE_IDENTIFIER = "com.tristanhimmelman.$(PRODUCT_NAME:rfc1034identifier)";
13851386
PRODUCT_NAME = "$(PROJECT_NAME)";
13861387
SKIP_INSTALL = YES;
1387-
SWIFT_VERSION = 5.0;
1388+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1389+
SWIFT_VERSION = 4.2;
13881390
TVOS_DEPLOYMENT_TARGET = 9.0;
13891391
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13901392
};
@@ -1402,7 +1404,8 @@
14021404
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14031405
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
14041406
PRODUCT_NAME = "$(TARGET_NAME)";
1405-
SWIFT_VERSION = 5.0;
1407+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1408+
SWIFT_VERSION = 4.0;
14061409
};
14071410
name = Debug;
14081411
};
@@ -1414,7 +1417,8 @@
14141417
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14151418
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
14161419
PRODUCT_NAME = "$(TARGET_NAME)";
1417-
SWIFT_VERSION = 5.0;
1420+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1421+
SWIFT_VERSION = 4.0;
14181422
};
14191423
name = Release;
14201424
};
@@ -1442,7 +1446,7 @@
14421446
PRODUCT_NAME = "$(PROJECT_NAME)";
14431447
SDKROOT = macosx;
14441448
SKIP_INSTALL = YES;
1445-
SWIFT_VERSION = 5.0;
1449+
SWIFT_VERSION = 4.2;
14461450
TVOS_DEPLOYMENT_TARGET = 9.0;
14471451
WATCHOS_DEPLOYMENT_TARGET = 2.0;
14481452
};
@@ -1470,7 +1474,7 @@
14701474
PRODUCT_NAME = "$(PROJECT_NAME)";
14711475
SDKROOT = macosx;
14721476
SKIP_INSTALL = YES;
1473-
SWIFT_VERSION = 5.0;
1477+
SWIFT_VERSION = 4.2;
14741478
TVOS_DEPLOYMENT_TARGET = 9.0;
14751479
WATCHOS_DEPLOYMENT_TARGET = 2.0;
14761480
};
@@ -1491,7 +1495,7 @@
14911495
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
14921496
PRODUCT_NAME = "$(TARGET_NAME)";
14931497
SDKROOT = macosx;
1494-
SWIFT_VERSION = 5.0;
1498+
SWIFT_VERSION = 4.2;
14951499
};
14961500
name = Debug;
14971501
};
@@ -1508,7 +1512,7 @@
15081512
PRODUCT_BUNDLE_IDENTIFIER = "com.heart.$(PRODUCT_NAME:rfc1034identifier)";
15091513
PRODUCT_NAME = "$(TARGET_NAME)";
15101514
SDKROOT = macosx;
1511-
SWIFT_VERSION = 5.0;
1515+
SWIFT_VERSION = 4.2;
15121516
};
15131517
name = Release;
15141518
};
@@ -1532,7 +1536,7 @@
15321536
PRODUCT_NAME = ObjectMapper;
15331537
SDKROOT = macosx;
15341538
SKIP_INSTALL = YES;
1535-
SWIFT_VERSION = 5.0;
1539+
SWIFT_VERSION = 4.2;
15361540
};
15371541
name = Debug;
15381542
};
@@ -1557,7 +1561,7 @@
15571561
PRODUCT_NAME = ObjectMapper;
15581562
SDKROOT = macosx;
15591563
SKIP_INSTALL = YES;
1560-
SWIFT_VERSION = 5.0;
1564+
SWIFT_VERSION = 4.2;
15611565
};
15621566
name = Release;
15631567
};

‎ObjectMapper.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Tests/ObjectMapperTests/ImmutableTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ class ImmutableObjectTests: XCTestCase {
201201
XCTAssertEqual(immutable.delimiterNestedDictionary, ["a": 10, "b": 20, "c": 30])
202202

203203
let JSON2: [String: Any] = [ "prop1": "prop1", "prop2": NSNull() ]
204-
let immutable2 = try? mapper.map(JSON: JSON2) as Struct
204+
let immutable2 = try? mapper.map(JSON: JSON2)
205205
XCTAssertNil(immutable2)
206206

207207
// TODO: ImmutableMappable to JSON
208208
let JSONFromObject = mapper.toJSON(immutable)
209-
let objectFromJSON = try? mapper.map(JSON: JSONFromObject) as Struct
209+
let objectFromJSON = try? mapper.map(JSON: JSONFromObject)
210210
XCTAssertNotNil(objectFromJSON)
211211
assertImmutableObjectsEqual(objectFromJSON!, immutable)
212212
}

‎Tests/ObjectMapperTests/MapContextTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class MapContextTests: XCTestCase {
138138
let JSON = ["name": "Anton"]
139139
let context = ImmutableContext(isDeveloper: true)
140140

141-
let person = try? Mapper<ImmutablePerson>(context: context).map(JSON: JSON) as ImmutablePerson
141+
let person = try? Mapper<ImmutablePerson>(context: context).map(JSON: JSON)
142142

143143
XCTAssertNotNil(person)
144144

@@ -149,7 +149,7 @@ class MapContextTests: XCTestCase {
149149
let JSON = ["name": "Anton"]
150150
let context = ImmutableContext(isDeveloper: true)
151151

152-
let person = try? ImmutablePerson(JSON: JSON, context: context) as ImmutablePerson
152+
let person = try? ImmutablePerson(JSON: JSON, context: context)
153153

154154
XCTAssertNotNil(person)
155155
XCTAssertEqual(person?.isDeveloper ?? !context.isDeveloper, context.isDeveloper)
@@ -172,7 +172,7 @@ class MapContextTests: XCTestCase {
172172
let JSON = ["person": ["name": "Anton"]]
173173
let context = ImmutableContext(isDeveloper: true)
174174

175-
let nestedPerson = try? Mapper<ImmutableNestedPerson>(context: context).map(JSON: JSON) as ImmutableNestedPerson
175+
let nestedPerson = try? Mapper<ImmutableNestedPerson>(context: context).map(JSON: JSON)
176176

177177
XCTAssertNotNil(nestedPerson)
178178
XCTAssertEqual(nestedPerson?.person.isDeveloper ?? !context.isDeveloper, context.isDeveloper)
@@ -182,7 +182,7 @@ class MapContextTests: XCTestCase {
182182
let JSON = ["person": ["name": "Anton"]]
183183
let context = ImmutableContext(isDeveloper: true)
184184

185-
let nestedPerson = try? ImmutableNestedPerson(JSON: JSON, context: context) as ImmutableNestedPerson
185+
let nestedPerson = try? ImmutableNestedPerson(JSON: JSON, context: context)
186186

187187
XCTAssertNotNil(nestedPerson)
188188
XCTAssertEqual(nestedPerson?.person.isDeveloper ?? !context.isDeveloper, context.isDeveloper)
@@ -207,7 +207,7 @@ class MapContextTests: XCTestCase {
207207
let JSON = ["persons": [["name": "Tristan"], ["name": "Anton"]]]
208208
let context = ImmutableContext(isDeveloper: true)
209209

210-
let personList = try? Mapper<ImmutablePersonList>(context: context).map(JSON: JSON) as ImmutablePersonList
210+
let personList = try? Mapper<ImmutablePersonList>(context: context).map(JSON: JSON)
211211

212212
XCTAssertNotNil(personList)
213213

@@ -220,7 +220,7 @@ class MapContextTests: XCTestCase {
220220
let JSON = ["persons": [["name": "Tristan"], ["name": "Anton"]]]
221221
let context = ImmutableContext(isDeveloper: true)
222222

223-
let personList = try? ImmutablePersonList(JSON: JSON, context: context) as ImmutablePersonList
223+
let personList = try? ImmutablePersonList(JSON: JSON, context: context)
224224

225225
XCTAssertNotNil(personList)
226226

‎Tests/ObjectMapperTests/MappableExtensionsTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,12 @@ struct TestMappable: Mappable, Equatable, Hashable {
4444
mutating func mapping(map: Map) {
4545
value <- map["value"]
4646
}
47-
48-
49-
func hash(into hasher: inout Hasher) {
47+
48+
var hashValue: Int {
5049
if let value = value {
51-
hasher.combine(value)
52-
} else {
53-
hasher.combine(NSIntegerMax)
50+
return value.hashValue
5451
}
52+
return NSIntegerMax
5553
}
5654
}
5755

‎Tests/ObjectMapperTests/PerformanceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class PerformanceTests: XCTestCase {
7171

7272
func testPerformanceImmutable() {
7373
self.measure {
74-
_ = try? Mapper<PerformanceImmutableMappableObject>().mapArray(JSONString: self.JSONTestString) as [PerformanceImmutableMappableObject]
74+
_ = try? Mapper<PerformanceImmutableMappableObject>().mapArray(JSONString: self.JSONTestString)
7575
}
7676
}
7777
}

0 commit comments

Comments
 (0)