From c376feefbadfb7e42d80fab123e283fc36f27d03 Mon Sep 17 00:00:00 2001
From: "jd@jonathandowning.uk" <jd@jonathandowning.uk>
Date: Sat, 29 Jun 2019 15:22:26 +0100
Subject: [PATCH] Update for Swift 5

---
 .gitignore                        |  1 +
 Package.swift                     |  2 +-
 Sources/METAR/METAR.swift         | 19 ++++++++++++++-----
 Tests/METARTests/METARTests.swift |  3 ++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02c0875..cd984ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /.build
 /Packages
 /*.xcodeproj
+/*.swiftpm
diff --git a/Package.swift b/Package.swift
index 1f95be4..7b5267c 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.1
+// swift-tools-version:5.0
 import PackageDescription
 
 let package = Package(
diff --git a/Sources/METAR/METAR.swift b/Sources/METAR/METAR.swift
index 396f8cf..2f225f6 100644
--- a/Sources/METAR/METAR.swift
+++ b/Sources/METAR/METAR.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 public struct METAR: Codable, Equatable {
     
     public var identifier: String
@@ -32,9 +33,10 @@ public struct METAR: Codable, Equatable {
     
 }
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 extension METAR {
     
-    static func noaaFlightRules(ceilingAndVisibilityOK: Bool, cloudLayers: [CloudLayer], visibility: Measurement<UnitLength>?) -> NOAAFlightRules? {
+    private static func noaaFlightRules(ceilingAndVisibilityOK: Bool, cloudLayers: [CloudLayer], visibility: Measurement<UnitLength>?) -> NOAAFlightRules? {
         if ceilingAndVisibilityOK {
             return .vfr
         }
@@ -72,9 +74,10 @@ extension METAR {
     
 }
 
-extension METAR {
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
+public extension METAR {
     
-    public init?(rawMETAR: String) {
+    init?(rawMETAR: String) {
         self.init(metar: rawMETAR, fullMETAR: true)
     }
     
@@ -518,6 +521,7 @@ extension METAR {
     
 }
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 public struct QNH: Equatable, Codable {
     
     enum Unit: String, Codable {
@@ -539,6 +543,7 @@ public struct QNH: Equatable, Codable {
     
 }
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 public struct Temperature: Equatable, Codable {
     
     enum Unit: String, Codable {
@@ -557,6 +562,7 @@ public struct Temperature: Equatable, Codable {
     
 }
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 public struct Visibility: Equatable, Codable {
     
     public enum Unit: String, Codable {
@@ -582,6 +588,7 @@ public struct Visibility: Equatable, Codable {
     
 }
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 public struct Wind: Codable, Equatable {
     
     public struct Speed: Codable, Equatable {
@@ -629,6 +636,7 @@ public enum SkyCondition: String, Codable {
     case skyClear
 }
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 public struct CloudLayer: Equatable, Codable {
     
     public struct Height: Equatable, Codable {
@@ -721,6 +729,7 @@ public enum MilitaryColourCode: String, Codable {
     case red
 }
 
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
 public struct Forecast: Codable, Equatable {
     
     public enum `Type`: String, Codable {
@@ -739,9 +748,9 @@ public enum NOAAFlightRules: String, Codable {
     case lifr
 }
 
-extension String {
+fileprivate extension String {
     
-    fileprivate func matches(for regularExpression: NSRegularExpression) -> [[Range<String.Index>?]] {
+    func matches(for regularExpression: NSRegularExpression) -> [[Range<String.Index>?]] {
         return regularExpression
             .matches(in: self, range: NSRange(location: 0, length: utf16.count))
             .map { result in (0..<result.numberOfRanges).map { Range(result.range(at: $0), in: self) } }
diff --git a/Tests/METARTests/METARTests.swift b/Tests/METARTests/METARTests.swift
index e9dac63..6876237 100644
--- a/Tests/METARTests/METARTests.swift
+++ b/Tests/METARTests/METARTests.swift
@@ -1,7 +1,8 @@
 import XCTest
 @testable import METAR
 
-class METARTests: XCTestCase {
+@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)
+final class METARTests: XCTestCase {
     
     func testDatelessMETAR() {
         let metarString = "KRDU 22007KT 9SM FEW080 FEW250 22/20 A3004 RMK AO2 SLP166 60000 T02170200 10222 20206 53022"