Merge pull request #8 from AlfredoHernandez/feature/os-update

Package platforms update
AlfredoHernandez · Jul 12, 2023 · 2898907 · 2898907
2 parents 77a89cc + 1e6afa3
commit 2898907
Show file tree

Hide file tree

Showing 26 changed files with 199 additions and 63 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -0,0 +1,27 @@
+# This workflow will build a Swift project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
+
+name: Swift
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: macos-13
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Select Xcode Version
+      run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
+
+    - name: Build
+      run: swift build -vv
+
+    - name: Run tests
+      run: swift test list --parallel -vv
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.3
+5.8
diff --git a/.swiftpm/WhatsNew.xctestplan b/.swiftpm/WhatsNew.xctestplan
@@ -0,0 +1,33 @@
+{
+  "configurations" : [
+    {
+      "id" : "F17011D2-13DA-4700-B107-AD87D2D0EBBC",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : {
+      "targets" : [
+        {
+          "containerPath" : "container:",
+          "identifier" : "WhatsNew",
+          "name" : "WhatsNew"
+        }
+      ]
+    },
+    "testExecutionOrdering" : "random"
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "WhatsNewTests",
+        "name" : "WhatsNewTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/WhatsNew.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/WhatsNew.xcscheme
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WhatsNew"
+               BuildableName = "WhatsNew"
+               BlueprintName = "WhatsNew"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WhatsNewTests"
+               BuildableName = "WhatsNewTests"
+               BlueprintName = "WhatsNewTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:.swiftpm/WhatsNew.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WhatsNewTests"
+               BuildableName = "WhatsNewTests"
+               BlueprintName = "WhatsNewTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "WhatsNew"
+            BuildableName = "WhatsNew"
+            BlueprintName = "WhatsNew"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Package.swift b/Package.swift
@@ -1,26 +1,20 @@
-// swift-tools-version: 5.6
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version: 5.8
 
 import PackageDescription
 
 let package = Package(
     name: "WhatsNew",
     defaultLocalization: "en",
     platforms: [
-        .iOS(.v13),
+        .iOS(.v14),
+        .macOS(.v12),
     ],
     products: [
-        .library(
-            name: "WhatsNew",
-            targets: ["WhatsNew"]),
+        .library(name: "WhatsNew", targets: ["WhatsNew"]),
     ],
     dependencies: [],
     targets: [
-        .target(
-            name: "WhatsNew",
-            dependencies: []),
-        .testTarget(
-            name: "WhatsNewTests",
-            dependencies: ["WhatsNew"]),
+        .target(name: "WhatsNew", dependencies: []),
+        .testTarget(name: "WhatsNewTests", dependencies: ["WhatsNew"]),
     ]
 )
diff --git a/Sources/WhatsNew/Check Version Feature/AppVersion.swift b/Sources/WhatsNew/Check Version Feature/AppVersion.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Check Version Feature/Bundle+BuildNumber.swift b/Sources/WhatsNew/Check Version Feature/Bundle+BuildNumber.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Check Version Feature/ShowWhatsNewUseCase.swift b/Sources/WhatsNew/Check Version Feature/ShowWhatsNewUseCase.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Check Version Feature/String+Semver.swift b/Sources/WhatsNew/Check Version Feature/String+Semver.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Check Version Feature/WhatsNewStore.swift b/Sources/WhatsNew/Check Version Feature/WhatsNewStore.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Composition/WhatsNewComposer.swift b/Sources/WhatsNew/Composition/WhatsNewComposer.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Presentation/FeaturesBuilder.swift b/Sources/WhatsNew/Presentation/FeaturesBuilder.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Presentation/WhatsNewItemViewModel.swift b/Sources/WhatsNew/Presentation/WhatsNewItemViewModel.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/Presentation/WhatsNewPresenter.swift b/Sources/WhatsNew/Presentation/WhatsNewPresenter.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/WhatsNew/UI/WhatsNew.swift b/Sources/WhatsNew/UI/WhatsNew.swift
@@ -1,13 +1,13 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import SwiftUI
 
 public struct WhatsNew: View {
     @Environment(\.presentationMode) var presentationMode
     @ObservedObject var viewModel: WhatsNewViewModel
-    
+
     init(viewModel: WhatsNewViewModel) {
         self.viewModel = viewModel
     }
@@ -39,22 +39,13 @@ public struct WhatsNew: View {
                 }.padding()
             }
             .padding()
-            .modifier(WithNavigationBarTitleDisplayModeIfAvailable(displayMode: .inline))
+            #if os(iOS)
+            .navigationBarTitleDisplayMode(.inline)
+            #endif
         }
+        #if os(iOS)
         .navigationViewStyle(.stack)
-    }
-}
-
-struct WithNavigationBarTitleDisplayModeIfAvailable: ViewModifier {
-    let displayMode: NavigationBarItem.TitleDisplayMode
-
-    func body(content: Content) -> some View {
-        if #available(iOS 14.0, *) {
-            content
-                .navigationBarTitleDisplayMode(displayMode)
-        } else {
-            content
-        }
+        #endif
     }
 }
 
@@ -68,7 +59,7 @@ struct WhatsNew_Previews: PreviewProvider {
                 WhatsNew(
                     viewModel: WhatsNewViewModel(
                         state: WhatsNewState(
-                            title:  "Maps",
+                            title: "Maps",
                             features: featuresBuilder.build()
                         ), didTapContinueButton: { buttonTappedCount += 1 }
                     )

diff --git a/Sources/WhatsNew/UI/WhatsNewHeaderView.swift b/Sources/WhatsNew/UI/WhatsNewHeaderView.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import SwiftUI

diff --git a/Sources/WhatsNew/UI/WhatsNewItemView.swift b/Sources/WhatsNew/UI/WhatsNewItemView.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import SwiftUI
@@ -19,15 +19,9 @@ struct WhatsNewItemView: View {
                 .frame(width: 48, height: 48, alignment: .center)
                 .foregroundColor(.accentColor)
             VStack(alignment: .leading, spacing: 4) {
-                if #available(iOS 14.0, *) {
-                    Text(whatsNewItem.title)
-                        .font(.title3)
-                        .bold()
-                } else {
-                    Text(whatsNewItem.title)
-                        .font(.title)
-                        .bold()
-                }
+                Text(whatsNewItem.title)
+                    .font(.title3)
+                    .bold()
                 Text(whatsNewItem.subtitle)
                     .multilineTextAlignment(.leading)
                     .frame(maxWidth: .infinity, alignment: .leading)

diff --git a/Sources/WhatsNew/UI/WhatsNewViewModel.swift b/Sources/WhatsNew/UI/WhatsNewViewModel.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import SwiftUI

diff --git a/Tests/WhatsNewTests/Check Version Feature/AppVersionComparisonTests.swift b/Tests/WhatsNewTests/Check Version Feature/AppVersionComparisonTests.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import WhatsNew

diff --git a/Tests/WhatsNewTests/Check Version Feature/ShowWhatsNewUseCaseTests.swift b/Tests/WhatsNewTests/Check Version Feature/ShowWhatsNewUseCaseTests.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 @testable import WhatsNew

diff --git a/Tests/WhatsNewTests/Presentation/FeaturesBuilderTests.swift b/Tests/WhatsNewTests/Presentation/FeaturesBuilderTests.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 @testable import WhatsNew

diff --git a/Tests/WhatsNewTests/Presentation/WhatsNewPresentationTests.swift b/Tests/WhatsNewTests/Presentation/WhatsNewPresentationTests.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 @testable import WhatsNew
@@ -24,7 +24,7 @@ class WhatsNewPresentationTests: XCTestCase {
         if value == key {
             XCTFail("Missing localized string for key: `\(key)` in table: `\(table)`", file: file, line: line)
         }
-        if let param = param { return String(format: value, param) }
+        if let param { return String(format: value, param) }
         return value
     }
 }
diff --git a/WhatsNewSampleApp/WhatsNewSampleApp/SampleAppFeaturesBuilder.swift b/WhatsNewSampleApp/WhatsNewSampleApp/SampleAppFeaturesBuilder.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright © 2022 Jesús Alfredo Hernández Alarcón. All rights reserved.
+//  Copyright © 2023 Jesús Alfredo Hernández Alarcón. All rights reserved.
 //
 
 import Foundation