Skip to content

Commit 7aff881

Browse files
colemancdacolemancda
authored
Merge pull request #106 from OpenStack-mobile/swift3
Swift 3 Migration
2 parents b85fe46 + 8e8b302 commit 7aff881

File tree

312 files changed

+5185
-5744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+5185
-5744
lines changed

‎Cartfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
github "OpenStack-Mobile/SwiftFoundation" "Swift.2.2"
1+
github "PureSwift/JSON" "master"
2+
github "PureSwift/Predicate" "master"
23
github "OpenStack-Mobile/aerogear-ios-http" "master"
34
github "OpenStack-Mobile/aerogear-ios-oauth2" "openstack"
45
github "JonasGessner/JGProgressHUD"
5-
github "OpenStack-Mobile/XLPagerTabStrip" "master"
6+
github "xmartlabs/XLPagerTabStrip"
67
github "OpenStack-Mobile/SWRevealViewController" "master"
7-
github "OpenStack-Mobile/R.swift.Library" "OpenStack"
8+
github "mac-cain13/R.swift.Library"
89
github "OpenStack-Mobile/HanekeSwift" "master"
910
github "OpenStack-Mobile/KTCenterFlowLayout" "master"
1011
github "OpenStack-Mobile/AFHorizontalDayPicker" "master"
11-
github "OpenStack-Mobile/Cosmos" "swift-2.3"
12-
github "OpenStack-Mobile/AHKActionSheet" "master"
13-
github "OpenStack-Mobile/ImageSlideshow" "master"
12+
github "marketplacer/Cosmos"
13+
github "zvonicek/ImageSlideshow"
1414
github "OpenStack-Mobile/XCDYouTubeKit"
1515
github "OpenStack-Mobile/MTDates" "master"
16-
github "OpenStack-mobile/SlackTextViewController"
16+
github "OpenStack-Mobile/SlackTextViewController"

‎Cartfile.resolved‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
github "OpenStack-Mobile/AHKActionSheet" "4ac799305b10ac39306dfdf45a359f88c94cc41d"
2-
github "OpenStack-Mobile/Cosmos" "2ee4a896fcbdc915e95bcb7456f996c27492fb34"
3-
github "OpenStack-Mobile/HanekeSwift" "9854d345ecb620299b9c2eb1c2f94cbda6e692d6"
4-
github "OpenStack-Mobile/ImageSlideshow" "38587ee81532ffafff989a18f45cb0be399fa078"
1+
github "marketplacer/Cosmos" "9.0.0"
2+
github "OpenStack-Mobile/HanekeSwift" "e97c06307fd8cd5b3a03875d0950d73db688f2bd"
3+
github "zvonicek/ImageSlideshow" "1.3.0"
54
github "JonasGessner/JGProgressHUD" "v1.4.1"
6-
github "PureSwift/JSON-C" "cb04249de9ed23ecc5e3ea772a4c6c46f86b3d86"
5+
github "PureSwift/JSON" "e208ddd1df2749d4f2fc5bc2392d8bebd1edafb8"
76
github "OpenStack-Mobile/KTCenterFlowLayout" "603f33180563cfa4fcab99a0623bbde21e49665b"
87
github "OpenStack-Mobile/MTDates" "def729947a5f07d6440ce9b97f2761af299bc13c"
9-
github "OpenStack-Mobile/R.swift.Library" "45bfbc29afc2ac9115187a4b4f869339f2447648"
8+
github "AliSoftware/OHHTTPStubs" "6.0.0"
9+
github "PureSwift/Predicate" "36141936dfcacd847f6b5a3a0a08b38e22354576"
10+
github "mac-cain13/R.swift.Library" "v3.0.2"
1011
github "OpenStack-Mobile/SWRevealViewController" "c3113e1508597ee2d9ea7081d97caa5117dddf00"
11-
github "OpenStack-mobile/SlackTextViewController" "v1.9.5"
12+
github "OpenStack-Mobile/SlackTextViewController" "v1.9.5"
1213
github "OpenStack-Mobile/XCDYouTubeKit" "2.5.3"
13-
github "OpenStack-Mobile/XLPagerTabStrip" "dd31ec30fc71d7cd534cf81662b9f1ff3875b7d0"
14-
github "OpenStack-Mobile/aerogear-ios-http" "274b560fbf9fb902fbb329bdbd20a728521fd186"
14+
github "xmartlabs/XLPagerTabStrip" "7.0.0"
1515
github "OpenStack-Mobile/AFHorizontalDayPicker" "74c3521f935039b2b6e945380ecd06752076ec8a"
16-
github "OpenStack-Mobile/SwiftFoundation" "6288d7a238fd503498fd26cf199c17ed3894c508"
17-
github "OpenStack-Mobile/aerogear-ios-oauth2" "8a3a5599adea4586e28f0ac7a1540bbc09af4c8d"
16+
github "OpenStack-Mobile/aerogear-ios-http" "baeeaf6947d1afb58e3235a732b50c5a58923cad"
17+
github "OpenStack-Mobile/aerogear-ios-oauth2" "6a134a2e68ea612960ba10e18524280aa69ca356"

‎OpenStack Summit/CoreSummit/Affiliation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2017 OpenStack. All rights reserved.
77
//
88

9-
import struct SwiftFoundation.Date
9+
import struct Foundation.Date
1010

1111
public struct Affiliation: Unique {
1212

‎OpenStack Summit/CoreSummit/AffiliationJSON.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2017 OpenStack. All rights reserved.
77
//
88

9-
import SwiftFoundation
9+
import JSON
1010

1111
public extension Affiliation {
1212

@@ -18,14 +18,14 @@ public extension Affiliation {
1818

1919
extension Affiliation: JSONDecodable {
2020

21-
public init?(JSONValue: JSON.Value) {
21+
public init?(json JSONValue: JSON.Value) {
2222

2323
guard let JSONObject = JSONValue.objectValue,
24-
let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
24+
let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
2525
let isCurrent = JSONObject[JSONKey.is_current.rawValue]?.rawValue as? Bool,
2626
let organizationJSON = JSONObject[JSONKey.organization.rawValue],
27-
let organization = AffiliationOrganization(JSONValue: organizationJSON),
28-
let member = JSONObject[JSONKey.owner_id.rawValue]?.rawValue as? Int
27+
let organization = AffiliationOrganization(json: organizationJSON),
28+
let member = JSONObject[JSONKey.owner_id.rawValue]?.integerValue
2929
else { return nil }
3030

3131
self.identifier = identifier
@@ -35,7 +35,7 @@ extension Affiliation: JSONDecodable {
3535

3636
// optional values
3737

38-
if let startDate = JSONObject[JSONKey.start_date.rawValue]?.rawValue as? Int {
38+
if let startDate = JSONObject[JSONKey.start_date.rawValue]?.integerValue {
3939

4040
self.start = Date(timeIntervalSince1970: TimeInterval(startDate))
4141

@@ -44,7 +44,7 @@ extension Affiliation: JSONDecodable {
4444
self.start = nil
4545
}
4646

47-
if let endDate = JSONObject[JSONKey.end_date.rawValue]?.rawValue as? Int {
47+
if let endDate = JSONObject[JSONKey.end_date.rawValue]?.integerValue {
4848

4949
self.end = Date(timeIntervalSince1970: TimeInterval(endDate))
5050

‎OpenStack Summit/CoreSummit/AffiliationManagedObject.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
//
88

99
import CoreData
10-
import SwiftFoundation
10+
import Foundation
1111

1212
public final class AffiliationManagedObject: Entity {
1313

1414
@NSManaged public var member: MemberManagedObject
1515

16-
@NSManaged public var start: NSDate?
16+
@NSManaged public var start: Date?
1717

18-
@NSManaged public var end: NSDate?
18+
@NSManaged public var end: Date?
1919

2020
@NSManaged public var isCurrent: Bool
2121

@@ -26,14 +26,14 @@ extension Affiliation: CoreDataDecodable {
2626

2727
public init(managedObject: AffiliationManagedObject) {
2828

29-
self.identifier = managedObject.identifier
29+
self.identifier = managedObject.id
3030
self.isCurrent = managedObject.isCurrent
31-
self.member = managedObject.member.identifier
31+
self.member = managedObject.member.id
3232
self.organization = AffiliationOrganization(managedObject: managedObject.organization)
3333

3434
if let startDate = managedObject.start {
3535

36-
self.start = Date(foundation: startDate)
36+
self.start = startDate
3737

3838
} else {
3939

@@ -42,7 +42,7 @@ extension Affiliation: CoreDataDecodable {
4242

4343
if let endDate = managedObject.end {
4444

45-
self.end = Date(foundation: endDate)
45+
self.end = endDate
4646

4747
} else {
4848

@@ -53,12 +53,12 @@ extension Affiliation: CoreDataDecodable {
5353

5454
extension Affiliation: CoreDataEncodable {
5555

56-
public func save(context: NSManagedObjectContext) throws -> AffiliationManagedObject {
56+
public func save(_ context: NSManagedObjectContext) throws -> AffiliationManagedObject {
5757

5858
let managedObject = try cached(context)
5959

60-
managedObject.start = start?.toFoundation()
61-
managedObject.end = end?.toFoundation()
60+
managedObject.start = start
61+
managedObject.end = end
6262
managedObject.isCurrent = isCurrent
6363
managedObject.member = try context.relationshipFault(member)
6464
managedObject.organization = try context.relationshipFault(organization)

‎OpenStack Summit/CoreSummit/AffiliationOrganizationJSON.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2017 OpenStack. All rights reserved.
77
//
88

9-
import SwiftFoundation
9+
import JSON
1010

1111
public extension AffiliationOrganization {
1212

@@ -18,10 +18,10 @@ public extension AffiliationOrganization {
1818

1919
extension AffiliationOrganization: JSONDecodable {
2020

21-
public init?(JSONValue: JSON.Value) {
21+
public init?(json JSONValue: JSON.Value) {
2222

2323
guard let JSONObject = JSONValue.objectValue,
24-
let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
24+
let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
2525
let name = JSONObject[JSONKey.name.rawValue]?.rawValue as? String
2626
else { return nil }
2727

‎OpenStack Summit/CoreSummit/AffiliationOrganizationManagedObject.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ extension AffiliationOrganization: CoreDataDecodable {
1717

1818
public init(managedObject: AffiliationOrganizationManagedObject) {
1919

20-
self.identifier = managedObject.identifier
20+
self.identifier = managedObject.id
2121
self.name = managedObject.name
2222
}
2323
}
2424

2525
extension AffiliationOrganization: CoreDataEncodable {
2626

27-
public func save(context: NSManagedObjectContext) throws -> AffiliationOrganizationManagedObject {
27+
public func save(_ context: NSManagedObjectContext) throws -> AffiliationOrganizationManagedObject {
2828

2929
let managedObject = try cached(context)
3030

‎OpenStack Summit/CoreSummit/AttendeeJSON.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2016 OpenStack. All rights reserved.
77
//
88

9-
import SwiftFoundation
9+
import JSON
1010

1111
public extension Attendee {
1212

@@ -18,15 +18,15 @@ public extension Attendee {
1818

1919
extension Attendee: JSONDecodable {
2020

21-
public init?(JSONValue: JSON.Value) {
21+
public init?(json JSONValue: JSON.Value) {
2222

2323
guard let JSONObject = JSONValue.objectValue,
24-
let identifier = JSONObject[JSONKey.id.rawValue]?.rawValue as? Int,
25-
let member = JSONObject[JSONKey.member_id.rawValue]?.rawValue as? Int,
24+
let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
25+
let member = JSONObject[JSONKey.member_id.rawValue]?.integerValue,
2626
let scheduledEventsJSONArray = JSONObject[JSONKey.schedule.rawValue]?.arrayValue,
27-
let scheduledEvents = Identifier.fromJSON(scheduledEventsJSONArray),
27+
let scheduledEvents = Identifier.from(json: scheduledEventsJSONArray),
2828
let ticketsJSONArray = JSONObject[JSONKey.tickets.rawValue]?.arrayValue,
29-
let tickets = Identifier.fromJSON(ticketsJSONArray)
29+
let tickets = Identifier.from(json: ticketsJSONArray)
3030
else { return nil }
3131

3232
self.identifier = identifier

‎OpenStack Summit/CoreSummit/AttendeeManagedObject.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ extension Attendee: CoreDataDecodable {
2222

2323
public init(managedObject: AttendeeManagedObject) {
2424

25-
self.identifier = managedObject.identifier
26-
self.member = managedObject.member.identifier
25+
self.identifier = managedObject.id
26+
self.member = managedObject.member.id
2727
self.tickets = managedObject.tickets.identifiers
2828
self.schedule = managedObject.schedule.identifiers
2929
}
3030
}
3131

3232
extension Attendee: CoreDataEncodable {
3333

34-
public func save(context: NSManagedObjectContext) throws -> AttendeeManagedObject {
34+
public func save(_ context: NSManagedObjectContext) throws -> AttendeeManagedObject {
3535

3636
let managedObject = try cached(context)
3737

‎OpenStack Summit/CoreSummit/CollectionType.swift‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,7 @@
66
// Copyright © 2016 OpenStack. All rights reserved.
77
//
88

9-
public extension CollectionType {
10-
11-
@inline(__always)
12-
func firstMatching(@noescape predicate: (Self.Generator.Element) throws -> Bool) rethrows -> Self.Generator.Element? {
13-
14-
guard let index = try self.indexOf(predicate)
15-
else { return nil }
16-
17-
return self[index]
18-
}
9+
public extension Collection {
1910

2011
/// Attempt to reduce and convert the contents of the collection to another type.
2112
func reduce<T>(to type: T.Type) -> [T] {
@@ -32,4 +23,4 @@ public extension CollectionType {
3223

3324
return newTypeArray
3425
}
35-
}
26+
}

0 commit comments

Comments
 (0)