- Yay! SwiftLint is back!

- Updated to the latest dependencies. - Updated to the latest Xcode settings.
RiftValleySoftware · Jan 19, 2025 · 6da44e7 · 6da44e7
1 parent 238a160
commit 6da44e7
Show file tree

Hide file tree

Showing 32 changed files with 187 additions and 125 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -2,14 +2,15 @@ disabled_rules:
 - identifier_name
 - nesting
 - function_parameter_count
-- function_body_length
 - trailing_whitespace
 - type_name
-- file_length
-- type_body_length
-- inclusive_language
-- large_tuple
-- empty_enum_arguments
+- todo
+- inert_defer
+- syntactic_sugar
+- implicit_getter
+- non_optional_string_data_conversion
+- private_over_fileprivate
+- legacy_hashing
 
 opt_in_rules:
 - control_statement
@@ -18,19 +19,28 @@ opt_in_rules:
 - colon
 - comma
 
-excluded:
-- Package.swift
-- ".build"
-- docs
-- img
-- spec
-- Project-Meta
-- DerivedData
+function_body_length:
+- 99 # warning
+- 100 #error
+
+file_length:
+- 1999 # warning
+- 2000 # error
+
+type_body_length:
+- 399 # warning
+- 400 # error
 
 line_length:
-- 222 # warning
-- 223 # error
+- 299 # warning
+- 300 # error
 
 cyclomatic_complexity:
-- 09 # warning
-- 10 # error
+- 11 # warning
+- 12 # error
+
+excluded:
+- Pods
+- Carthage
+- .build
+- Tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+**1.3.7** *January 19, 2025*
+
+- Yay! SwiftLint is back!
+- Updated to the latest dependencies.
+- Updated to the latest Xcode settings.
+
+**1.3.6** *January 6, 2023*
+
+- Added privacy declarations.
+- Had to remove SwiftLint, as it no longer works. :(
+- Looks like I messed up, and didn't do a changelog for the intermediate releases. My bad. >:(
+
 **1.2.4** *October 6, 2022*
 
 - Just a dependency. No API changes.

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Rift Valley Software, Inc.
+Copyright (c) 2022-2025 Rift Valley Software, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/PRIVACY.md b/PRIVACY.md
@@ -0,0 +1,5 @@
+# Privacy Declaration
+
+This project collects **absolutely no information at all**, from anyone, at any time.
+
+It is hosted on GitHub, so users of the library may need to understand [GitHub's Privacy Policy](https://docs.github.com/en/site-policy/privacy-policies/github-privacy-statement).
diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,5 @@
 // swift-tools-version:5.5
-// © Copyright 2022, The Great Rift Valley Software Company
+// © Copyright 2022-2025, The Great Rift Valley Software Company
 //
 // LICENSE:
 //

diff --git a/PrivacyInfo.xcprivacy b/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>
diff --git a/README.md b/README.md
@@ -169,7 +169,7 @@ The playing card images that we use in the test harness app, came from [Wikimedi
 
 ## License
 
- © Copyright 2022, The Great Rift Valley Software Company
+ © Copyright 2022-2025, The Great Rift Valley Software Company
 
 The code is [MIT license](https://opensource.org/licenses/MIT). Use it as you will. Attribution is appreciated.
 

diff --git a/RVS_MaskButton.xcodeproj/project.pbxproj b/RVS_MaskButton.xcodeproj/project.pbxproj
@@ -57,6 +57,7 @@
 		D46197EA2802F7F200EC71A9 /* RVS_MaskButton_TestHarness_Cards_ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RVS_MaskButton_TestHarness_Cards_ViewController.swift; sourceTree = "<group>"; };
 		D46197F52802F8F000EC71A9 /* RVS_MaskButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RVS_MaskButton.swift; sourceTree = "<group>"; };
 		D46197F92802FAD800EC71A9 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
+		D48C5EE22D3D559400F0542B /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = "<group>"; };
 		D4902FB02805AA9F00D4DD3D /* RVS_MaskButton.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RVS_MaskButton.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D4902FB82805AA9F00D4DD3D /* RVS_MaskButton_TestHarness.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RVS_MaskButton_TestHarness.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D4B141B52803000D00E9C7E2 /* RVS_MaskButton_TestHarness_TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RVS_MaskButton_TestHarness_TabBarController.swift; sourceTree = "<group>"; };
@@ -167,6 +168,7 @@
 		D475EAB72802F5F80064A6AC = {
 			isa = PBXGroup;
 			children = (
+				D48C5EE22D3D559400F0542B /* .swiftlint.yml */,
 				D46197F82802FAD800EC71A9 /* Project Meta */,
 				D46197F32802F8F000EC71A9 /* Sources */,
 				D46197DC2802F7F200EC71A9 /* Tests */,
@@ -182,7 +184,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D475EAE02802F6DD0064A6AC /* Build configuration list for PBXNativeTarget "RVS_MaskButton_TestHarness" */;
 			buildPhases = (
-				D449AA492805AD06000C1FD8 /* SwiftLint */,
 				D475EACB2802F6DB0064A6AC /* Sources */,
 				D475EACC2802F6DB0064A6AC /* Frameworks */,
 				D475EACD2802F6DB0064A6AC /* Resources */,
@@ -206,7 +207,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = D4902FB92805AA9F00D4DD3D /* Build configuration list for PBXNativeTarget "RVS_MaskButton" */;
 			buildPhases = (
-				D449AA482805ACF0000C1FD8 /* SwiftLint */,
+				D4052F0F2D3D550E00876FBA /* SwiftLint */,
 				D4902FAC2805AA9F00D4DD3D /* Sources */,
 			);
 			buildRules = (
@@ -228,7 +229,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1620;
 				TargetAttributes = {
 					D475EACE2802F6DB0064A6AC = {
 						CreatedOnToolsVersion = 13.3;
@@ -277,7 +278,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		D449AA482805ACF0000C1FD8 /* SwiftLint */ = {
+		D4052F0F2D3D550E00876FBA /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
@@ -294,26 +295,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if command -v swiftlint\nthen\n    swiftlint\nfi\n";
-		};
-		D449AA492805AD06000C1FD8 /* SwiftLint */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = SwiftLint;
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "if command -v swiftlint\nthen\n    swiftlint\nfi\n";
+			shellScript = "if command -v swiftlint 2>&1 >/dev/null\nthen\n    cd ${PROJECT_DIR}\n    swiftlint\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -382,6 +364,7 @@
 			baseConfigurationReference = D46197F92802FAD800EC71A9 /* Warnings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -415,6 +398,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -446,6 +430,7 @@
 			baseConfigurationReference = D46197F92802FAD800EC71A9 /* Warnings.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -479,6 +464,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -502,7 +488,6 @@
 		D475EAE12802F6DD0064A6AC /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
@@ -521,7 +506,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.3.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-MaskButton-TestHarness";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -533,7 +518,6 @@
 		D475EAE22802F6DD0064A6AC /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
@@ -552,7 +536,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.3.7;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-MaskButton-TestHarness";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -564,13 +548,15 @@
 		D4902FBA2805AA9F00D4DD3D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 0000;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = KSAUGZFWP2;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -581,6 +567,8 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.2.2;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-MaskButton";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -594,13 +582,15 @@
 		D4902FBB2805AA9F00D4DD3D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 0000;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = KSAUGZFWP2;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -611,6 +601,8 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.2.2;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.riftvalleysoftware.RVS-MaskButton";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -659,15 +651,15 @@
 			repositoryURL = "https://github.com/RiftValleySoftware/RVS_BasicGCDTimer.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.1.2;
+				minimumVersion = 1.7.1;
 			};
 		};
 		D4CF404628D514410002A1A9 /* XCRemoteSwiftPackageReference "RVS_Generic_Swift_Toolbox" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/RiftValleySoftware/RVS_Generic_Swift_Toolbox";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.11.0;
+				minimumVersion = 1.15.5;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

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

diff --git a/RVS_MaskButton.xcworkspace/contents.xcworkspacedata b/RVS_MaskButton.xcworkspace/contents.xcworkspacedata
diff --git a/Sources/RVS_MaskButton/RVS_MaskButton.docc/RVS_MaskButton.md b/Sources/RVS_MaskButton/RVS_MaskButton.docc/RVS_MaskButton.md
@@ -168,7 +168,7 @@ The playing card images that we use in the test harness app, came from [Wikimedi
 
 ## License
 
- © Copyright 2022, The Great Rift Valley Software Company
+ © Copyright 2022-2025, The Great Rift Valley Software Company
 
 The code is [MIT license](https://opensource.org/licenses/MIT). Use it as you will. Attribution is appreciated.
 

diff --git a/Sources/RVS_MaskButton/RVS_MaskButton.swift b/Sources/RVS_MaskButton/RVS_MaskButton.swift
@@ -1,5 +1,5 @@
 /**
- © Copyright 2022, The Great Rift Valley Software Company
+ © Copyright 2022-2025, The Great Rift Valley Software Company
 
  LICENSE:
 
@@ -19,7 +19,7 @@
 
  The Great Rift Valley Software Company: https://riftvalleysoftware.com
 
- Version 1.2.4
+ Version 1.3.7
 */
 
 import UIKit

diff --git a/Tests/RVS_MaskButton_TestHarness/MainApplication/RVS_MaskButton_SceneDelegate.swift b/Tests/RVS_MaskButton_TestHarness/MainApplication/RVS_MaskButton_SceneDelegate.swift
@@ -1,5 +1,5 @@
 /**
- © Copyright 2022, The Great Rift Valley Software Company
+ © Copyright 2022-2025, The Great Rift Valley Software Company
 
  LICENSE:
 

diff --git a/Tests/RVS_MaskButton_TestHarness/Resources/Base.lproj/Localizable.strings b/Tests/RVS_MaskButton_TestHarness/Resources/Base.lproj/Localizable.strings
@@ -1,5 +1,5 @@
 /*
- © Copyright 2022, The Great Rift Valley Software Company
+ © Copyright 2022-2025, The Great Rift Valley Software Company
 
  LICENSE: