CATTY-723 Support iOS 17 & Xcode 15

Catrobat · Jan 19, 2024 · 7b466c0 · 7b466c0
1 parent e488257
commit 7b466c0
Show file tree

Hide file tree

Showing 21 changed files with 188 additions and 175 deletions.
diff --git a/src/.ruby-version b/src/.ruby-version
@@ -1 +1 @@
-3.1.2
+3.3.0
diff --git a/src/.swiftlint.yml b/src/.swiftlint.yml
@@ -3,11 +3,13 @@ only_rules:
  # swiftlint rules
 
  #- accessibility_label_for_image
+ #- accessibility_trait_for_button
  #- anonymous_argument_in_multiline_closure
- - anyobject_protocol
+ #- anyobject_protocol
  #- array_init
  #- attributes
  #- balanced_xctest_lifecycle
+ #- blanket_disable_command
  - block_based_kvo
  #- capture_variable
  - class_delegate_protocol
@@ -33,13 +35,15 @@ only_rules:
  - custom_rules
  #- cyclomatic_complexity
  #- deployment_target
+ #- direct_return
  - discarded_notification_center_observer
  #- discouraged_assert
  - discouraged_direct_init
  #- discouraged_none_name
  - discouraged_object_literal
  - discouraged_optional_boolean
  #- discouraged_optional_collection
+ #- duplicate_conditions
  #- duplicate_enum_cases
  #- duplicate_imports
  #- duplicated_key_in_dictionary_literal
@@ -86,6 +90,7 @@ only_rules:
  #- inclusive_language
  #- indentation_width
  #- inert_defer
+ #- invalid_swiftlint_command
  - is_disjoint
  - joined_default_parameter
  #- large_tuple
@@ -102,6 +107,7 @@ only_rules:
  - let_var_whitespace
  - line_length
  - literal_expression_end_indentation
+ #- local_doc_comment
  #- lower_acl_than_parent
  - mark
  #- missing_docs
@@ -118,8 +124,11 @@ only_rules:
  #- no_extension_access_modifier
  - no_fallthrough_only
  #- no_grouping_extension
+ #- no_magic_numbers
  #- no_space_in_method_call
+ #- non_overridable_class_declaration
  - notification_center_detachment
+ #- ns_number_init_as_function_reference
  #- nslocalizedstring_key
  #- nslocalizedstring_require_bundle
  #- nsobject_prefer_isequal
@@ -133,6 +142,7 @@ only_rules:
  #- overridden_super_call
  #- override_in_extension
  #- pattern_matching_keywords
+ #- period_spacing
  #- prefer_nimble
  #- prefer_self_in_static_references
  #- prefer_self_type_over_type_of_self
@@ -142,6 +152,7 @@ only_rules:
  - private_outlet
  #- private_over_fileprivate
  #- private_subject
+ #- private_swiftui_state
  - private_unit_test
  #- prohibited_interface_builder
  - prohibited_super_call
@@ -156,6 +167,7 @@ only_rules:
  - redundant_nil_coalescing
  #- redundant_objc_attribute
  - redundant_optional_initialization
+ #- redundant_self_in_closure
  - redundant_set_access_control
  - redundant_string_enum_value
  - redundant_type_annotation
@@ -167,14 +179,17 @@ only_rules:
  #- self_binding
  #- self_in_property_initialization
  - shorthand_operator
+ #- shorthand_optional_binding
  #- single_test_class
+ #- sorted_enum_cases
  - sorted_first_last
  - sorted_imports
  - statement_position
  #- static_operator
  #- strict_fileprivate
  #- strong_iboutlet
  - superfluous_disable_command
+ #- superfluous_else
  - switch_case_alignment
  - switch_case_on_newline
  - syntactic_sugar
@@ -192,8 +207,11 @@ only_rules:
  #- typesafe_array_init
  #- unavailable_condition
  #- unavailable_function
+ #- unhandled_throwing_task
  - unneeded_break_in_switch
+ #- unneeded_override
  - unneeded_parentheses_in_closure_argument
+ #- unneeded_synthesized_initializer
  #- unowned_variable_capture
  - untyped_error_in_catch
  #- unused_capture_list

diff --git a/src/Catty.xcodeproj/project.pbxproj b/src/Catty.xcodeproj/project.pbxproj
@@ -11482,8 +11482,9 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1120;
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1520;
 				TargetAttributes = {
 					187E079F24E26CED00E652C4 = {
 						CreatedOnToolsVersion = 11.2.1;
@@ -14006,7 +14007,6 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "CattyUISnapshots/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14046,7 +14046,6 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "CattyUISnapshots/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14085,7 +14084,6 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = CattyUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14121,7 +14119,6 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = CattyUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14175,6 +14172,7 @@
 				DEFINES_MODULE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -14198,7 +14196,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = Catty;
@@ -14249,6 +14247,7 @@
 				CURRENT_PROJECT_VERSION = 0.1;
 				DEFINES_MODULE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 3;
@@ -14271,7 +14270,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "Pocket Code";
 				PROVISIONING_PROFILE = "";
@@ -14316,7 +14315,6 @@
 					"\"$(TARGET_TEMP_DIR)/../$(PROJECT_NAME).build/DerivedSources\"",
 				);
 				INFOPLIST_FILE = CattyTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14362,7 +14360,6 @@
 					"\"$(TARGET_TEMP_DIR)/../$(PROJECT_NAME).build/DerivedSources\"",
 				);
 				INFOPLIST_FILE = CattyTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14402,7 +14399,6 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = $SDKROOT/usr/include/libxml2;
 				INFOPLIST_FILE = "Catty/Supporting Files/App-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14447,7 +14443,6 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = $SDKROOT/usr/include/libxml2;
 				INFOPLIST_FILE = "Catty/Supporting Files/App-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -14525,40 +14520,40 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/AudioKit/AudioKit";
 			requirement = {
-				kind = exactVersion;
-				version = 5.4.4;
+				kind = upToNextMajorVersion;
+				minimumVersion = 5.6.2;
 			};
 		};
 		17A0218B2726F3C500F0489E /* XCRemoteSwiftPackageReference "DunneAudioKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/AudioKit/DunneAudioKit";
 			requirement = {
-				kind = exactVersion;
-				version = 5.4.1;
+				kind = upToNextMajorVersion;
+				minimumVersion = 5.6.1;
 			};
 		};
 		17D5F5CC266A819000C678FF /* XCRemoteSwiftPackageReference "ZipArchive" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/ZipArchive/ZipArchive.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 2.4.2;
+				kind = upToNextMinorVersion;
+				minimumVersion = 2.4.3;
 			};
 		};
 		4CE05752266E2287008AD7FF /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 8.9.1;
+				minimumVersion = 10.20.0;
 			};
 		};
 		4CFAC28B25ADCD8100AF0DD1 /* XCRemoteSwiftPackageReference "Nimble" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Quick/Nimble";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 9.2.1;
+				minimumVersion = 13.2.0;
 			};
 		};
 		4CFAC2CB25ADD12100AF0DD1 /* XCRemoteSwiftPackageReference "DVR" */ = {
@@ -14574,15 +14569,15 @@
 			repositoryURL = "https://github.com/onevcat/Kingfisher";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 7.6.2;
+				minimumVersion = 7.10.2;
 			};
 		};
 		4CFAC30625ADD89E00AF0DD1 /* XCRemoteSwiftPackageReference "Siren" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/ArtSabintsev/Siren";
 			requirement = {
-				kind = exactVersion;
-				version = 5.5.1;
+				kind = upToNextMajorVersion;
+				minimumVersion = 6.1.2;
 			};
 		};
 		7B9090E727C931E600B31D04 /* XCRemoteSwiftPackageReference "ChromaSwift" */ = {