Raise minimum OS versions (#51)

With the [release of Xcode 14][released], Apple dropped support for a few different OS versions. This commit also drops support for those versions in what will become the 3.0 release for this package. [released]: https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes
launchdarkly · Oct 5, 2022 · 893d7d0 · 893d7d0
1 parent e642325
commit 893d7d0
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -155,6 +155,11 @@ workflows:
 
   build:
     jobs:
+      - build:
+          name: Xcode 14.0 - Swift 5.7
+          xcode-version: '14.0.1'
+          ios-sim: 'platform=iOS Simulator,name=iPhone 14,OS=16.0'
+          build-doc: true
       - build:
           name: Xcode 13.1 - Swift 5.5
           xcode-version: '13.1.0'
@@ -169,18 +174,21 @@ workflows:
           xcode-version: '11.7.0'
           ios-sim: 'platform=iOS Simulator,name=iPhone 8,OS=12.4'
           build-universal: false
+      - build_linux:
+          name: Linux - Swift 5.5
+          docker-image: swift:5.5
       - build_linux:
           name: Linux - Swift 5.4
-          docker-image: norionomura/swift:5.4
+          docker-image: swift:5.4
       - build_linux:
           name: Linux - Swift 5.3
-          docker-image: norionomura/swift:5.3
+          docker-image: swift:5.3
           discover-tests: true
       - build_linux:
           name: Linux - Swift 5.2
-          docker-image: norionomura/swift:5.2
+          docker-image: swift:5.2
           discover-tests: true
       - build_linux:
           name: Linux - Swift 5.1
-          docker-image: norionomura/swift:5.1
+          docker-image: swift:5.1
           discover-tests: true
diff --git a/ContractTestService/Package.swift b/ContractTestService/Package.swift
@@ -5,10 +5,10 @@ import PackageDescription
 let package = Package(
   name: "ContractTestService",
   platforms: [
-    .iOS(.v10),
-    .macOS(.v10_12),
-    .watchOS(.v3),
-    .tvOS(.v10),
+    .iOS(.v11),
+    .macOS(.v10_13),
+    .watchOS(.v4),
+    .tvOS(.v11),
   ],
   products: [
     .executable(

diff --git a/LDSwiftEventSource.xcodeproj/project.pbxproj b/LDSwiftEventSource.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -239,6 +239,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		B46C1C6B24CF348B00283630 /* Linter Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -350,8 +351,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Source/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -362,10 +363,10 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
 			};
 			name = Debug;
 		};
@@ -419,8 +420,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Source/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.launchdarkly.LDSwiftEventSource;
@@ -430,10 +431,10 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Mintfile b/Mintfile
@@ -1 +1 @@
-realm/SwiftLint@0.41.0
+realm/SwiftLint@0.49.1
diff --git a/Package.swift b/Package.swift
@@ -5,10 +5,10 @@ import PackageDescription
 let package = Package(
     name: "LDSwiftEventSource",
     platforms: [
-        .iOS(.v10),
-        .macOS(.v10_12),
-        .watchOS(.v3),
-        .tvOS(.v10)
+        .iOS(.v11),
+        .macOS(.v10_13),
+        .watchOS(.v4),
+        .tvOS(.v11)
     ],
     products: [
         .library(name: "LDSwiftEventSource", targets: ["LDSwiftEventSource"]),

diff --git a/Tests/LDSwiftEventSourceTests.swift b/Tests/LDSwiftEventSourceTests.swift
@@ -323,7 +323,7 @@ final class LDSwiftEventSourceTests: XCTestCase {
         config.urlSessionConfiguration = sessionWithMockProtocol()
         config.reconnectTime = 0.1
         config.connectionErrorHandler = { _ in
-            return .shutdown
+            .shutdown
         }
         let es = EventSource(config: config)
         es.start()