Merge pull request #40 from faberNovel/release/v11.4.0

Release 11.4.0
faberNovel · Jul 5, 2023 · 793fb01 · 793fb01
2 parents ee4125d + e7e5b88
commit 793fb01
Show file tree

Hide file tree

Showing 211 changed files with 664 additions and 431 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -15,7 +15,8 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.5
+        ruby-version: 3.1.4
+        bundler-cache: true
 
     - name: Bundle install
       run: bundle install

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.5
+        ruby-version: 3.1.4
         bundler-cache: true
 
     - name: Pods cache

diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml
@@ -14,7 +14,8 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.5
+        ruby-version: 3.1.4
+        bundler-cache: true
 
     - name: Bundle install
       run: bundle install

diff --git a/ADUtils.podspec b/ADUtils.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'ADUtils'
-  spec.version      = '11.3.0'
+  spec.version      = '11.4.0'
   spec.authors      = 'Fabernovel'
   spec.homepage     = 'https://github.com/faberNovel/ADUtils'
   spec.summary      = 'Fabernovel\'s toolbox for iOS'

diff --git a/ADUtils.xcodeproj/project.pbxproj b/ADUtils.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -51,6 +51,7 @@
 		921907DF21F7AE4400EF2B67 /* ADLayoutGuideTestsObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 921907DE21F7AE4400EF2B67 /* ADLayoutGuideTestsObjc.m */; };
 		92DA1F5F2257556800060A32 /* NSLayoutConstraintUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92DA1F5E2257556800060A32 /* NSLayoutConstraintUtilsTests.swift */; };
 		92FAEA942271DF0D0090A2C7 /* FailableDecodableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92FAEA932271DF0D0090A2C7 /* FailableDecodableTests.swift */; };
+		ACD166862A45C0A700374A7E /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = ACD166852A45C0A700374A7E /* SnapshotTesting */; };
 		B0E1495F269444E600712620 /* SecureArchiverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0E1495E269444E600712620 /* SecureArchiverTests.swift */; };
 		E7D5F497242DED3C0048C0DC /* OptionalGetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7D5F496242DED3C0048C0DC /* OptionalGetTests.swift */; };
 		E7D5F499242DEF120048C0DC /* UINavigationItemBackItemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7D5F498242DEF120048C0DC /* UINavigationItemBackItemTests.swift */; };
@@ -173,6 +174,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				47E17214F9A4009CF12359D7 /* Pods_ADUtilsTests.framework in Frameworks */,
+				ACD166862A45C0A700374A7E /* SnapshotTesting in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -414,6 +416,9 @@
 				49B1F7841CE4B3DB00A29BFE /* PBXTargetDependency */,
 			);
 			name = ADUtilsTests;
+			packageProductDependencies = (
+				ACD166852A45C0A700374A7E /* SnapshotTesting */,
+			);
 			productName = ADUtilsTests;
 			productReference = 49B1F77E1CE4B3DB00A29BFE /* ADUtilsTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
@@ -473,6 +478,9 @@
 				en,
 			);
 			mainGroup = 7A0EC6441535D8ED00E5F54A;
+			packageReferences = (
+				ACD166842A45C0A700374A7E /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
+			);
 			productRefGroup = 7A0EC6501535D8ED00E5F54A /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -580,19 +588,15 @@
 				"${PODS_ROOT}/Target Support Files/Pods-ADUtilsTests/Pods-ADUtilsTests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/ADUtils/ADUtils.framework",
 				"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
-				"${BUILT_PRODUCTS_DIR}/Nimble-Snapshots/Nimble_Snapshots.framework",
 				"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
 				"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
-				"${BUILT_PRODUCTS_DIR}/iOSSnapshotTestCase/FBSnapshotTestCase.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ADUtils.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble_Snapshots.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSnapshotTestCase.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -743,7 +747,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = ADUtilsTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = applidium.ADUtilsTests;
@@ -774,7 +782,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = ADUtilsTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = applidium.ADUtilsTests;
@@ -805,7 +817,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = ADUtilsTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = applidium.ADUtilsTests;
@@ -836,7 +852,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = ADUtilsTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = applidium.ADUtilsTests;
@@ -891,7 +911,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				PROVISIONING_PROFILE_SPECIFIER = "$(PROFILE_UDID)";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
@@ -912,7 +932,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ADUtils-Prefix.pch";
 				INFOPLIST_FILE = "Configuration/ADUtils/ADUtils-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.applidium.ADUtils;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -963,7 +986,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PROVISIONING_PROFILE_SPECIFIER = "$(PROFILE_UDID)";
 				SDKROOT = iphoneos;
@@ -986,7 +1009,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ADUtils-Prefix.pch";
 				INFOPLIST_FILE = "Configuration/ADUtils/ADUtils-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.applidium.ADUtils;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1039,7 +1065,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				PROVISIONING_PROFILE_SPECIFIER = "$(PROFILE_UDID)";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
@@ -1060,7 +1086,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ADUtils-Prefix.pch";
 				INFOPLIST_FILE = "Configuration/ADUtils/ADUtils-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.applidium.ADUtils;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1114,7 +1143,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				PROVISIONING_PROFILE_SPECIFIER = "$(PROFILE_UDID)";
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 5.0;
@@ -1135,7 +1164,10 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ADUtils-Prefix.pch";
 				INFOPLIST_FILE = "Configuration/ADUtils/ADUtils-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.applidium.ADUtils;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1183,6 +1215,25 @@
 			defaultConfigurationName = Distribution;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		ACD166842A45C0A700374A7E /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		ACD166852A45C0A700374A7E /* SnapshotTesting */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = ACD166842A45C0A700374A7E /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
+			productName = SnapshotTesting;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 7A0EC6461535D8ED00E5F54A /* Project object */;
 }
diff --git a/ADUtils.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ADUtils.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-snapshot-testing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-snapshot-testing.git",
+      "state" : {
+        "revision" : "cef5b3f6f11781dd4591bdd1dd0a3d22bd609334",
+        "version" : "1.11.0"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/ADUtilsTests/ArrayFilterTests.swift b/ADUtilsTests/ArrayFilterTests.swift
@@ -17,7 +17,7 @@ private struct Vendor {
 
 class ArrayFilterTests: QuickSpec {
 
-    override func spec() {
+    override class func spec() {
 
         it("should filter the array") {
             let vendors = [

diff --git a/ADUtilsTests/AttributedStringTest.swift b/ADUtilsTests/AttributedStringTest.swift
@@ -8,14 +8,14 @@
 
 import Foundation
 import Nimble
-import Nimble_Snapshots
+import SnapshotTesting
 import Quick
 import ADUtils
 @testable import ADUtilsApp
 
 class AttributedStringTest: QuickSpec {
 
-    override func spec() {
+    override class func spec() {
 
         let stringTest = { (string: String, arguments: [String], imageName: String) -> Void in
             guard
@@ -50,7 +50,7 @@ class AttributedStringTest: QuickSpec {
             let label = UILabel()
             label.attributedText = attributedString
             label.sizeToFit()
-            expect(label).to(haveValidSnapshot(named: imageName))
+            assertSnapshot(matching: label, as: .image, named: imageName)
         }
 
         it("Snapshots should match") {

diff --git a/ADUtilsTests/ChildInsertionTest.swift b/ADUtilsTests/ChildInsertionTest.swift
@@ -14,7 +14,7 @@ import ADUtils
 
 class ChildInsertionTest: QuickSpec {
 
-    override func spec() {
+    override class func spec() {
         it("should insert a view controller in a subview") {
             let viewController = UIViewController()
             let child = UIViewController()

diff --git a/ADUtilsTests/DebouncedTests.swift b/ADUtilsTests/DebouncedTests.swift
@@ -18,7 +18,7 @@ private enum Constants {
 /// Test for regular Debouncer class
 class DebouncerTests: QuickSpec {
 
-    override func spec() {
+    override class func spec() {
 
         var debouncer: Debouncer?
         var counter: Int = 0
@@ -85,10 +85,10 @@ class DebouncerTests: QuickSpec {
 class DebouncedTests: QuickSpec {
 
     @Debounced(delay: Constants.delay, queue: .main)
-    private var toggleAction: () -> Void
-    private var actionExecuted: Bool = false
+    private static var toggleAction: () -> Void
+    private static var actionExecuted: Bool = false
 
-    override func spec() {
+    override class func spec() {
 
         beforeEach {
             self.actionExecuted = false

diff --git a/ADUtilsTests/DeselectableViewTests.swift b/ADUtilsTests/DeselectableViewTests.swift
@@ -67,7 +67,7 @@ private class TransitionCoordinator: NSObject, UIViewControllerTransitionCoordin
 
 class DeselectableViewTests: QuickSpec {
 
-    override func spec() {
+    override class func spec() {
 
         let selectedIndexPath = IndexPath(row: 0, section: 0)
         var transitionCoordinator: TransitionCoordinator!