From 21a8df921c45d3ac01b29a6bd0080a8f23d19784 Mon Sep 17 00:00:00 2001 From: Yakov Manshin Date: Fri, 17 May 2024 09:16:25 +0200 Subject: [PATCH 1/4] Updated Swift Version in `Package.swift` --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 57da0ff..572bc96 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.8 +// swift-tools-version: 5.9 import PackageDescription From 719f62b93e8239a211d5506429988d1bac03a151 Mon Sep 17 00:00:00 2001 From: Yakov Manshin Date: Fri, 17 May 2024 09:16:36 +0200 Subject: [PATCH 2/4] Updated Swift Version in Podspec --- YMFF.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YMFF.podspec b/YMFF.podspec index 840ca7a..d70cad3 100644 --- a/YMFF.podspec +++ b/YMFF.podspec @@ -4,7 +4,7 @@ Pod::Spec.new do |s| s.name = "YMFF" s.version = "4.0.0" - s.swift_version = "5.8" + s.swift_version = "5.9" s.authors = { "Yakov Manshin" => "git@yakovmanshin.com" } s.license = { :type => "Apache License, version 2.0", :file => "LICENSE" } s.homepage = "https://github.com/yakovmanshin/YMFF" From 6aba5f1d94523a0e98d587eec85cc7e5765325cb Mon Sep 17 00:00:00 2001 From: Yakov Manshin Date: Fri, 17 May 2024 09:16:43 +0200 Subject: [PATCH 3/4] Updated GHA Workflow --- .github/workflows/Common.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/Common.yml b/.github/workflows/Common.yml index b8547d8..11b69d8 100644 --- a/.github/workflows/Common.yml +++ b/.github/workflows/Common.yml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.OS }} strategy: matrix: - SWIFT_VERSION: ["5.10", "5.9", "5.8"] + SWIFT_VERSION: ["5.10", "5.9"] include: - SWIFT_VERSION: "5.10" OS: macos-14 @@ -31,9 +31,6 @@ jobs: - SWIFT_VERSION: "5.9" OS: macos-13 XCODE_APP_NAME: "Xcode_15.2" - - SWIFT_VERSION: "5.8" - OS: macos-13 - XCODE_APP_NAME: "Xcode_14.3.1" steps: - uses: actions/checkout@v4 - name: Select Xcode Version From f0fd45f9829b6dda510a983730152e356e2f2a90 Mon Sep 17 00:00:00 2001 From: Yakov Manshin Date: Fri, 17 May 2024 09:17:17 +0200 Subject: [PATCH 4/4] Removed Redundant `return`s --- .../FeatureFlagValueTransformerTests.swift | 21 +++++++------------ .../Utilities/FeatureFlagStoreMock.swift | 8 +++---- .../MutableFeatureFlagStoreMock.swift | 8 +++---- .../SynchronousFeatureFlagStoreMock.swift | 8 +++---- ...nchronousMutableFeatureFlagStoreMock.swift | 8 +++---- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/Tests/YMFFTests/Cases/FeatureFlagValueTransformerTests.swift b/Tests/YMFFTests/Cases/FeatureFlagValueTransformerTests.swift index 7abd34b..b0169da 100644 --- a/Tests/YMFFTests/Cases/FeatureFlagValueTransformerTests.swift +++ b/Tests/YMFFTests/Cases/FeatureFlagValueTransformerTests.swift @@ -81,23 +81,16 @@ final class FeatureFlagValueTransformerTests: XCTestCase { func test_valueFromRawValue_enumFromInt() { let transformer = FeatureFlagValueTransformer { (age: Int) -> AgeGroup in switch age { - case ..<13: - return .under13 - case 13...17: - return .between13And17 - case 18...: - return .over17 - default: - return .under13 + case ..<13: .under13 + case 13...17: .between13And17 + case 18...: .over17 + default: .under13 } } rawValueFromValue: { group in switch group { - case .under13: - return 13 - case .between13And17: - return 17 - case .over17: - return 18 + case .under13: 13 + case .between13And17: 17 + case .over17: 18 } } diff --git a/Tests/YMFFTests/Utilities/FeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/FeatureFlagStoreMock.swift index ff4f284..5a6d123 100644 --- a/Tests/YMFFTests/Utilities/FeatureFlagStoreMock.swift +++ b/Tests/YMFFTests/Utilities/FeatureFlagStoreMock.swift @@ -29,14 +29,14 @@ extension FeatureFlagStoreMock: FeatureFlagStore { func value(for key: FeatureFlagKey) async -> Result { value_invocationCount += 1 value_keys.append(key) - switch value_result! { + return switch value_result! { case .success(let anyValue): if let value = anyValue as? Value { - return .success(value) + .success(value) } else { - return .failure(.typeMismatch) + .failure(.typeMismatch) } - case .failure(let error): return .failure(error) + case .failure(let error): .failure(error) } } diff --git a/Tests/YMFFTests/Utilities/MutableFeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/MutableFeatureFlagStoreMock.swift index 5b9d016..22101fc 100644 --- a/Tests/YMFFTests/Utilities/MutableFeatureFlagStoreMock.swift +++ b/Tests/YMFFTests/Utilities/MutableFeatureFlagStoreMock.swift @@ -37,14 +37,14 @@ extension MutableFeatureFlagStoreMock: MutableFeatureFlagStore { func value(for key: FeatureFlagKey) async -> Result { value_invocationCount += 1 value_keys.append(key) - switch value_result! { + return switch value_result! { case .success(let anyValue): if let value = anyValue as? Value { - return .success(value) + .success(value) } else { - return .failure(.typeMismatch) + .failure(.typeMismatch) } - case .failure(let error): return .failure(error) + case .failure(let error): .failure(error) } } diff --git a/Tests/YMFFTests/Utilities/SynchronousFeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/SynchronousFeatureFlagStoreMock.swift index aa42486..e128739 100644 --- a/Tests/YMFFTests/Utilities/SynchronousFeatureFlagStoreMock.swift +++ b/Tests/YMFFTests/Utilities/SynchronousFeatureFlagStoreMock.swift @@ -29,14 +29,14 @@ extension SynchronousFeatureFlagStoreMock: SynchronousFeatureFlagStore { func valueSync(for key: FeatureFlagKey) -> Result { valueSync_invocationCount += 1 valueSync_keys.append(key) - switch valueSync_result! { + return switch valueSync_result! { case .success(let anyValue): if let value = anyValue as? Value { - return .success(value) + .success(value) } else { - return .failure(.typeMismatch) + .failure(.typeMismatch) } - case .failure(let error): return .failure(error) + case .failure(let error): .failure(error) } } diff --git a/Tests/YMFFTests/Utilities/SynchronousMutableFeatureFlagStoreMock.swift b/Tests/YMFFTests/Utilities/SynchronousMutableFeatureFlagStoreMock.swift index b03ac80..18937e5 100644 --- a/Tests/YMFFTests/Utilities/SynchronousMutableFeatureFlagStoreMock.swift +++ b/Tests/YMFFTests/Utilities/SynchronousMutableFeatureFlagStoreMock.swift @@ -37,14 +37,14 @@ extension SynchronousMutableFeatureFlagStoreMock: SynchronousMutableFeatureFlagS func valueSync(for key: FeatureFlagKey) -> Result { valueSync_invocationCount += 1 valueSync_keys.append(key) - switch valueSync_result! { + return switch valueSync_result! { case .success(let anyValue): if let value = anyValue as? Value { - return .success(value) + .success(value) } else { - return .failure(.typeMismatch) + .failure(.typeMismatch) } - case .failure(let error): return .failure(error) + case .failure(let error): .failure(error) } }