Skip to content

Commit 3b354a0

Browse files
serhii-londarserhii-londar
authored
Merge pull request #1 from serhii-londar/MODEL-PARSING-ISSUES
Model parsing issues
2 parents 2e67047 + 5ad6ade commit 3b354a0

File tree

9 files changed

+20
-22
lines changed

9 files changed

+20
-22
lines changed

‎Example/GithubAPI.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,12 @@
262262
TargetAttributes = {
263263
607FACCF1AFB9204008FA782 = {
264264
CreatedOnToolsVersion = 6.3.1;
265-
LastSwiftMigration = 0900;
265+
LastSwiftMigration = 1000;
266266
ProvisioningStyle = Manual;
267267
};
268268
607FACE41AFB9204008FA782 = {
269269
CreatedOnToolsVersion = 6.3.1;
270-
LastSwiftMigration = 0900;
270+
LastSwiftMigration = 1000;
271271
TestTargetID = 607FACCF1AFB9204008FA782;
272272
};
273273
};
@@ -539,9 +539,9 @@
539539
MODULE_NAME = ExampleApp;
540540
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
541541
PRODUCT_NAME = "$(TARGET_NAME)";
542+
SWIFT_VERSION = 4.2;
542543
PROVISIONING_PROFILE_SPECIFIER = "";
543544
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
544-
SWIFT_VERSION = 4.0;
545545
};
546546
name = Debug;
547547
};
@@ -559,7 +559,7 @@
559559
PRODUCT_NAME = "$(TARGET_NAME)";
560560
PROVISIONING_PROFILE_SPECIFIER = "";
561561
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
562-
SWIFT_VERSION = 4.0;
562+
SWIFT_VERSION = 4.2;
563563
};
564564
name = Release;
565565
};
@@ -579,8 +579,7 @@
579579
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
580580
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
581581
PRODUCT_NAME = "$(TARGET_NAME)";
582-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
583-
SWIFT_VERSION = 4.0;
582+
SWIFT_VERSION = 4.2;
584583
};
585584
name = Debug;
586585
};
@@ -596,8 +595,7 @@
596595
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
597596
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
598597
PRODUCT_NAME = "$(TARGET_NAME)";
599-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
600-
SWIFT_VERSION = 4.0;
598+
SWIFT_VERSION = 4.2;
601599
};
602600
name = Release;
603601
};

‎Example/GithubAPI/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919

2020
return true

‎GithubAPI/Classes/RepositoriesAPI/Models/Repository/RepositoryParent.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ public struct RepositoryParent : Codable {
211211
networkCount = try values.decodeIfPresent(Int.self, forKey: .networkCount)
212212
notificationsUrl = try values.decodeIfPresent(String.self, forKey: .notificationsUrl)
213213
openIssuesCount = try values.decodeIfPresent(Int.self, forKey: .openIssuesCount)
214-
owner = try RepositoryOrganization(from: decoder)
215-
permissions = try RepositoryPermission(from: decoder)
214+
owner = try values.decodeIfPresent(RepositoryOrganization.self, forKey: .owner)
215+
permissions = try values.decodeIfPresent(RepositoryPermission.self, forKey: .permissions)
216216
privateField = try values.decodeIfPresent(Bool.self, forKey: .privateField)
217217
pullsUrl = try values.decodeIfPresent(String.self, forKey: .pullsUrl)
218218
pushedAt = try values.decodeIfPresent(String.self, forKey: .pushedAt)

‎GithubAPI/Classes/RepositoriesAPI/Models/Repository/RepositoryReponse.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,24 +213,24 @@ public struct RepositoryResponse : Codable {
213213
labelsUrl = try values.decodeIfPresent(String.self, forKey: .labelsUrl)
214214
language = try values.decodeIfPresent(String.self, forKey: .language)
215215
languagesUrl = try values.decodeIfPresent(String.self, forKey: .languagesUrl)
216-
license = try RepositoryLicense(from: decoder)
216+
license = try values.decodeIfPresent(RepositoryLicense.self, forKey: .license)
217217
mergesUrl = try values.decodeIfPresent(String.self, forKey: .mergesUrl)
218218
milestonesUrl = try values.decodeIfPresent(String.self, forKey: .milestonesUrl)
219219
mirrorUrl = try values.decodeIfPresent(String.self, forKey: .mirrorUrl)
220220
name = try values.decodeIfPresent(String.self, forKey: .name)
221221
networkCount = try values.decodeIfPresent(Int.self, forKey: .networkCount)
222222
notificationsUrl = try values.decodeIfPresent(String.self, forKey: .notificationsUrl)
223223
openIssuesCount = try values.decodeIfPresent(Int.self, forKey: .openIssuesCount)
224-
organization = try RepositoryOrganization(from: decoder)
225-
owner = try RepositoryOrganization(from: decoder)
226-
parent = try RepositoryParent(from: decoder)
227-
permissions = try RepositoryPermission(from: decoder)
224+
organization = try values.decodeIfPresent(RepositoryOrganization.self, forKey: .organization)
225+
owner = try values.decodeIfPresent(RepositoryOrganization.self, forKey: .owner)
226+
parent = try values.decodeIfPresent(RepositoryParent.self, forKey: .parent)
227+
permissions = try values.decodeIfPresent(RepositoryPermission.self, forKey: .permissions)
228228
privateField = try values.decodeIfPresent(Bool.self, forKey: .privateField)
229229
pullsUrl = try values.decodeIfPresent(String.self, forKey: .pullsUrl)
230230
pushedAt = try values.decodeIfPresent(String.self, forKey: .pushedAt)
231231
releasesUrl = try values.decodeIfPresent(String.self, forKey: .releasesUrl)
232232
size = try values.decodeIfPresent(Int.self, forKey: .size)
233-
source = try RepositoryParent(from: decoder)
233+
source = try values.decodeIfPresent(RepositoryParent.self, forKey: .source)
234234
sshUrl = try values.decodeIfPresent(String.self, forKey: .sshUrl)
235235
stargazersCount = try values.decodeIfPresent(Int.self, forKey: .stargazersCount)
236236
stargazersUrl = try values.decodeIfPresent(String.self, forKey: .stargazersUrl)

‎GithubAPI/Classes/SearchAPI/Models/Code/SearchCodeItem.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public struct SearchCodeItem : Codable {
3434
htmlUrl = try values.decodeIfPresent(String.self, forKey: .htmlUrl)
3535
name = try values.decodeIfPresent(String.self, forKey: .name)
3636
path = try values.decodeIfPresent(String.self, forKey: .path)
37-
repository = try SearchCodeRepository(from: decoder)
37+
repository = try values.decodeIfPresent(SearchCodeRepository.self, forKey: .repository)
3838
score = try values.decodeIfPresent(Float.self, forKey: .score)
3939
sha = try values.decodeIfPresent(String.self, forKey: .sha)
4040
url = try values.decodeIfPresent(String.self, forKey: .url)

‎GithubAPI/Classes/SearchAPI/Models/Code/SearchCodeRepository.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public struct SearchCodeRepository : Codable {
132132
milestonesUrl = try values.decodeIfPresent(String.self, forKey: .milestonesUrl)
133133
name = try values.decodeIfPresent(String.self, forKey: .name)
134134
notificationsUrl = try values.decodeIfPresent(String.self, forKey: .notificationsUrl)
135-
owner = try SearchCodeOwner(from: decoder)
135+
owner = try values.decodeIfPresent(SearchCodeOwner.self, forKey: .owner)
136136
privateField = try values.decodeIfPresent(Bool.self, forKey: .privateField)
137137
pullsUrl = try values.decodeIfPresent(String.self, forKey: .pullsUrl)
138138
stargazersUrl = try values.decodeIfPresent(String.self, forKey: .stargazersUrl)

‎GithubAPI/Classes/SearchAPI/Models/Commits/SearchCommitsItem.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public struct SearchCommitsItem : Codable {
3434

3535
public init(from decoder: Decoder) throws {
3636
let values = try decoder.container(keyedBy: CodingKeys.self)
37-
author = try SearchCommitsAuthor(from: decoder)
37+
author = try values.decodeIfPresent(SearchCommitsAuthor.self, forKey: .author)
3838
commentsUrl = try values.decodeIfPresent(String.self, forKey: .commentsUrl)
3939
commit = try values.decodeIfPresent(SearchCommitsCommit.self, forKey: .commit)
4040
committer = try values.decodeIfPresent(SearchCommitsCommitter.self, forKey: .committer)

‎GithubAPI/Classes/SearchAPI/Models/Issues/SearchIssuesMilestone.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public struct SearchIssuesMilestone : Codable {
4747
closedAt = try values.decodeIfPresent(String.self, forKey: .closedAt)
4848
closedIssues = try values.decodeIfPresent(Int.self, forKey: .closedIssues)
4949
createdAt = try values.decodeIfPresent(String.self, forKey: .createdAt)
50-
creator = try SearchIssuesMilestoneCreator(from: decoder)
50+
creator = try values.decodeIfPresent(SearchIssuesMilestoneCreator.self, forKey: .creator)
5151
descriptionField = try values.decodeIfPresent(String.self, forKey: .descriptionField)
5252
dueOn = try values.decodeIfPresent(String.self, forKey: .dueOn)
5353
htmlUrl = try values.decodeIfPresent(String.self, forKey: .htmlUrl)

‎GithubAPI/Classes/SearchAPI/Models/Repositories/SearchRepositoriesItem.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public struct SearchRepositoriesItem : Codable {
7171
masterBranch = try values.decodeIfPresent(String.self, forKey: .masterBranch)
7272
name = try values.decodeIfPresent(String.self, forKey: .name)
7373
openIssuesCount = try values.decodeIfPresent(Int.self, forKey: .openIssuesCount)
74-
owner = try SearchRepositoriesOwner(from: decoder)
74+
owner = try values.decodeIfPresent(SearchRepositoriesOwner.self, forKey: .owner)
7575
privateField = try values.decodeIfPresent(Bool.self, forKey: .privateField)
7676
pushedAt = try values.decodeIfPresent(String.self, forKey: .pushedAt)
7777
score = try values.decodeIfPresent(Float.self, forKey: .score)

0 commit comments

Comments
 (0)