spacepandas · fbernutz · May 12, 2024 · Jul 30, 2023 · Jul 30, 2023 · Jul 30, 2023
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,16 +11,16 @@ on:
 jobs:
   unit_tests:
     name: Unit Tests
-    runs-on: macOS-11
+    runs-on: macos-13
 
     steps:
     - name: Set Xcode Version
-      uses: maxim-lobanov/setup-xcode@v1.4.1
+      uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: '13.2.1'
+        xcode-version: '15.2'
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.0.0
 
     - name: Install Gem Dependencies
       run: bundle install
@@ -30,30 +30,19 @@ jobs:
 
   snapshot_tests:
     name: Snapshot Tests
-    runs-on: macOS-11
+    runs-on: macos-13
 
     steps:
     - name: Set Xcode Version
-      uses: maxim-lobanov/setup-xcode@v1.4.1
+      uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: '13.2.1'
+        xcode-version: '15.2'
 
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.0.0
 
     - name: Install Gem Dependencies
       run: bundle install
 
     - name: Run SnapshotTests
       run: bundle exec fastlane snapshot_test
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Run SwiftLint Checks
-      uses: norio-nomura/action-swiftlint@3.2.1
-      with:
-        args: --strict
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4.0.0
 
     - name: Get the Version
       id: get_version

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -21,7 +21,6 @@ opt_in_rules:
   - number_separator
   - nimble_operator
   - implicitly_unwrapped_optional
-  - attributes
   - first_where
   - multiline_parameters
   - multiline_arguments
@@ -35,19 +34,17 @@ opt_in_rules:
   - convenience_type
   - redundant_set_access_control
   - multiline_function_chains
-  - anyobject_protocol
   - toggle_bool
   - identical_operands
   - collection_alignment
   - static_operator
   - legacy_random
   - closure_body_length
-  - inert_defer
   - last_where
   - multiline_literal_brackets
   - multiline_parameters_brackets
   - multiline_arguments_brackets
-  - unused_import
+  - weak_delegate
 
 disabled_rules:
   - implicit_getter

diff --git a/Cineaste.xcodeproj/project.pbxproj b/Cineaste.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -72,7 +72,7 @@
 		3F492E7124F250C900016B2A /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F492E7024F250C900016B2A /* SwiftUI.framework */; };
 		3F492E7424F250C900016B2A /* CountdownWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F492E7324F250C900016B2A /* CountdownWidget.swift */; };
 		3F492E7624F250C900016B2A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3F492E7524F250C900016B2A /* Assets.xcassets */; };
-		3F492E7A24F250C900016B2A /* MovieReleaseWidgetExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 3F492E6C24F250C900016B2A /* MovieReleaseWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		3F492E7A24F250C900016B2A /* MovieReleaseWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 3F492E6C24F250C900016B2A /* MovieReleaseWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		3F492E8424F256CF00016B2A /* Movie+Testing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F492E8224F256CF00016B2A /* Movie+Testing.swift */; };
 		3F492E8824F25C8500016B2A /* AppGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F492E8724F25C8500016B2A /* AppGroup.swift */; };
 		3F492E8A24F25E9C00016B2A /* Movie.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95DC320C1F97E5150014E3EA /* Movie.swift */; };
@@ -82,7 +82,7 @@
 		3F4C9660232E1FB8002692D0 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3F4C965F232E1FB8002692D0 /* Colors.xcassets */; };
 		3F4F4D552233D3C40093CDEF /* SwipeAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F4F4D542233D3C40093CDEF /* SwipeAction.swift */; };
 		3F508CE024FD6E2A008A7DCB /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F508CDF24FD6E2A008A7DCB /* IntentHandler.swift */; };
-		3F508CF524FD6E2A008A7DCB /* SelectMovieIntentExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 3F508CDD24FD6E2A008A7DCB /* SelectMovieIntentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		3F508CF524FD6E2A008A7DCB /* SelectMovieIntentExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 3F508CDD24FD6E2A008A7DCB /* SelectMovieIntentExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		3F544E392381E2B300B26071 /* MoviesViewControllerSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F544E382381E2B300B26071 /* MoviesViewControllerSnapshotTests.swift */; };
 		3F544E3B2381EC1D00B26071 /* MoviesTabBarControllerSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F544E3A2381EC1D00B26071 /* MoviesTabBarControllerSnapshotTests.swift */; };
 		3F544E3D2381EDC700B26071 /* SearchMoviesViewControllerSnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F544E3C2381EDC700B26071 /* SearchMoviesViewControllerSnapshotTests.swift */; };
@@ -275,16 +275,16 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		3F492E7B24F250C900016B2A /* Embed App Extensions */ = {
+		3F492E7B24F250C900016B2A /* Embed Foundation Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				3F508CF524FD6E2A008A7DCB /* SelectMovieIntentExtension.appex in Embed App Extensions */,
-				3F492E7A24F250C900016B2A /* MovieReleaseWidgetExtension.appex in Embed App Extensions */,
+				3F508CF524FD6E2A008A7DCB /* SelectMovieIntentExtension.appex in Embed Foundation Extensions */,
+				3F492E7A24F250C900016B2A /* MovieReleaseWidgetExtension.appex in Embed Foundation Extensions */,
 			);
-			name = "Embed App Extensions";
+			name = "Embed Foundation Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -1148,7 +1148,7 @@
 				3FF7912420DE274A007B7D37 /* Resources */,
 				3F31164B25C5CC980045FCCF /* Set version number in Settings.bundle */,
 				3F48A7A3257CDFD900956F2E /* Update Acknowledgements in Settings.bundle */,
-				3F492E7B24F250C900016B2A /* Embed App Extensions */,
+				3F492E7B24F250C900016B2A /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
@@ -1175,8 +1175,9 @@
 		95AE25941F9531E20067F5F5 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1110;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1520;
 				ORGANIZATIONNAME = spacepandas.de;
 				TargetAttributes = {
 					3F2408F1203CB88E00EB9141 = {
@@ -1307,6 +1308,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3F31164B25C5CC980045FCCF /* Set version number in Settings.bundle */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -1325,6 +1327,7 @@
 		};
 		3F48A7A3257CDFD900956F2E /* Update Acknowledgements in Settings.bundle */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -1339,10 +1342,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which license-plist >/dev/null; then\n  license-plist \\\n    --output-path Cineaste/Settings.bundle \\\n    --package-path Cineaste.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.swift \\\n    --prefix Acknowledgements \\\n    --single-page \\\n    --force\nelse\n  echo \"warning: LicensePlist not installed, download from https://github.com/mono0926/LicensePlist\"\nfi\n";
+			shellScript = "if which license-plist >/dev/null; then\n  license-plist \\\n    --output-path Cineaste/Settings.bundle \\\n    --package-path Cineaste.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved \\\n    --prefix Acknowledgements \\\n    --single-page\nelse\n  echo \"warning: LicensePlist not installed, download from https://github.com/mono0926/LicensePlist\"\nfi\n";
 		};
 		3F5AF263218F80F8006717DC /* Check API Keys */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -1361,6 +1365,7 @@
 		};
 		3F9C0A1B23C92ECA00CDB993 /* Swift Lint */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 12;
 			files = (
 			);

diff --git a/Cineaste.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cineaste.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,43 +1,50 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "Kingfisher",
-        "repositoryURL": "https://github.com/onevcat/Kingfisher.git",
-        "state": {
-          "branch": null,
-          "revision": "32e4acdf6971f58f5ad552389cf2d7d016334eaf",
-          "version": "7.2.0"
-        }
-      },
-      {
-        "package": "ReSwift",
-        "repositoryURL": "https://github.com/ReSwift/ReSwift.git",
-        "state": {
-          "branch": null,
-          "revision": "96146a29f394ae4c79be025fcec194e5b0d9c3b6",
-          "version": "6.1.0"
-        }
-      },
-      {
-        "package": "ReSwiftThunk",
-        "repositoryURL": "https://github.com/ReSwift/ReSwift-Thunk.git",
-        "state": {
-          "branch": null,
-          "revision": "5ee9816158a2115863b1458c66cf1be9e9143b39",
-          "version": "2.0.1"
-        }
-      },
-      {
-        "package": "SnapshotTesting",
-        "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
-        "state": {
-          "branch": null,
-          "revision": "f8a9c997c3c1dab4e216a8ec9014e23144cbab37",
-          "version": "1.9.0"
-        }
+  "pins" : [
+    {
+      "identity" : "kingfisher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/onevcat/Kingfisher.git",
+      "state" : {
+        "revision" : "5b92f029fab2cce44386d28588098b5be0824ef5",
+        "version" : "7.11.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "reswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ReSwift/ReSwift.git",
+      "state" : {
+        "revision" : "cb5c3c02f652420ef413dea41e13ac5a76b6c0fd",
+        "version" : "6.1.1"
+      }
+    },
+    {
+      "identity" : "reswift-thunk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ReSwift/ReSwift-Thunk.git",
+      "state" : {
+        "revision" : "5ee9816158a2115863b1458c66cf1be9e9143b39",
+        "version" : "2.0.1"
+      }
+    },
+    {
+      "identity" : "swift-snapshot-testing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
+      "state" : {
+        "revision" : "625ccca8570773dd84a34ee51a81aa2bc5a4f97a",
+        "version" : "1.16.0"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax",
+      "state" : {
+        "revision" : "303e5c5c36d6a558407d364878df131c3546fad8",
+        "version" : "510.0.2"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Cineaste.xcodeproj/xcshareddata/xcschemes/Cineaste App.xcscheme b/Cineaste.xcodeproj/xcshareddata/xcschemes/Cineaste App.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Cineaste.xcodeproj/xcshareddata/xcschemes/MovieReleaseWidgetExtension.xcscheme b/Cineaste.xcodeproj/xcshareddata/xcschemes/MovieReleaseWidgetExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1520"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/Cineaste.xcodeproj/xcshareddata/xcschemes/SelectMovieIntentExtension.xcscheme b/Cineaste.xcodeproj/xcshareddata/xcschemes/SelectMovieIntentExtension.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1520"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/Cineaste.xcodeproj/xcshareddata/xcschemes/SnapshotTests.xcscheme b/Cineaste.xcodeproj/xcshareddata/xcschemes/SnapshotTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Cineaste.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme b/Cineaste.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Cineaste.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme b/Cineaste.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Cineaste/Extension/UIColor+Cineaste.swift b/Cineaste/Extension/UIColor+Cineaste.swift
@@ -62,3 +62,4 @@ extension UIColor {
     static let cineUsageActive = UIColor(named: "usageActive")!
     static let cineUsageInactive = UIColor(named: "usageInactive")!
 }
+// swiftlint:enable force_unwrapping
diff --git a/Cineaste/Models/PreviewAction.swift b/Cineaste/Models/PreviewAction.swift
@@ -16,7 +16,8 @@ enum PreviewAction {
     func previewAction(for movie: Movie) -> UIPreviewAction {
         let action = UIPreviewAction(
             title: title,
-            style: style) { _, _ -> Void in
+            style: style
+        ) { _, _ -> Void in
                 switch self {
                 case .delete:
                     store.dispatch(deleteMovie(movie))

diff --git a/Cineaste/Models/SwipeAction.swift b/Cineaste/Models/SwipeAction.swift
@@ -16,7 +16,8 @@ enum SwipeAction {
     func contextualAction(for movie: Movie) -> UIContextualAction {
         let action = UIContextualAction(
             style: .normal,
-            title: title) { _, _, success in
+            title: title
+        ) { _, _, success in
                 switch self {
                 case .delete:
                     store.dispatch(deleteMovie(movie))

diff --git a/Cineaste/Networking/Webservice.swift b/Cineaste/Networking/Webservice.swift
@@ -16,15 +16,6 @@ enum NetworkError: Error {
 }
 
 enum Webservice {
-    static var numberOfRequests = 0 {
-        didSet {
-            DispatchQueue.main.async {
-                UIApplication.shared.isNetworkActivityIndicatorVisible =
-                    numberOfRequests > 0
-            }
-        }
-    }
-
     @discardableResult
     static func load<A>(resource: Resource<A>?, completion: @escaping (Result<A, Error>) -> Void) -> URLSessionTask? {
         guard let resource = resource else {
@@ -38,11 +29,7 @@ enum Webservice {
         var request = URLRequest(url: url)
         request.httpMethod = resource.method.rawValue
 
-        numberOfRequests += 1
-
         let task = URLSession.shared.dataTask(with: request) { data, _, error in
-            numberOfRequests -= 1
-
             guard error == nil, let data = data else {
                 // swiftlint:disable:next force_unwrapping
                 completion(.failure(error!))

diff --git a/Cineaste/ReSwift/Thunks/SearchThunks.swift b/Cineaste/ReSwift/Thunks/SearchThunks.swift
@@ -9,7 +9,6 @@
 import Dispatch
 import ReSwiftThunk
 
-// swiftlint:disable:next closure_body_length
 let fetchSearchResults = Thunk<AppState> { dispatch, getState in
     guard let state = getState()?.searchState,
         !state.hasLoadedAllMovies,