Skip to content

Commit b75fa8c

Browse files
committed
Рефактор
- Поднял версию свифта для внутренних пакетов до 5.7.1 - Рефактор
1 parent 54bf652 commit b75fa8c

File tree

7 files changed

+8
-7
lines changed

7 files changed

+8
-7
lines changed

.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5.7.1

SwiftUI-WorkoutApp/DateFormatterService/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.6
1+
// swift-tools-version: 5.7.1
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription

SwiftUI-WorkoutApp/DateFormatterService/Sources/DateFormatterService/DateFormatterService.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public enum DateFormatterService {
3333
return dateFormatter.string(from: halfMinuteAgo)
3434
}
3535

36-
public static func dateFromIsoString(_ string: String?, format: DateFormat) -> Date {
36+
public static func dateFromIsoString(_ string: String?) -> Date {
3737
ISO8601DateFormatter().date(from: string.valueOrEmpty) ?? .now
3838
}
3939

SwiftUI-WorkoutApp/Models/EventForm.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ struct EventForm: Codable {
1212
init(_ event: EventResponse?) {
1313
self.title = (event?.formattedTitle).valueOrEmpty
1414
self.description = (event?.formattedDescription).valueOrEmpty
15-
self.date = DateFormatterService.dateFromIsoString(event?.beginDate, format: .isoDateTimeSec)
15+
self.date = DateFormatterService.dateFromIsoString(event?.beginDate)
1616
self.sportsGround = event?.sportsGround ?? .emptyValue
1717
self.photosCount = (event?.photos.count).valueOrZero
1818
}

SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapViewModel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ private extension SportsGroundsMapViewModel {
176176
guard let self = self else { return }
177177
var result = [SportsGround]()
178178
result = self.defaultList.filter { ground in
179-
self.filter.size.map { $0.code }.contains(ground.sizeID)
180-
&& self.filter.grade.map { $0.code }.contains(ground.typeID)
179+
self.filter.size.map(\.code).contains(ground.sizeID)
180+
&& self.filter.grade.map(\.code).contains(ground.typeID)
181181
}
182182
guard let countryID = countryID, countryID != .zero,
183183
let cityID = cityID, cityID != .zero,

SwiftUI-WorkoutApp/ShortAddressService/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.6
1+
// swift-tools-version: 5.7.1
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription

SwiftUI-WorkoutApp/Utils/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.6
1+
// swift-tools-version: 5.7.1
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription

0 commit comments

Comments
 (0)