Use Folders for Classes (#23736)

* Update CocoaPods * Use Folders for Classes * Add Swift 6 defaults for Aztec enums * Enforce iOS 13 compatibility for Pods
wordpress-mobile · Oct 31, 2024 · f4da7f9 · f4da7f9
1 parent 1bfc100
commit f4da7f9
Show file tree

Hide file tree

Showing 7 changed files with 2,575 additions and 18,284 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -5,8 +5,9 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.1)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -42,6 +43,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
+    benchmark (0.3.0)
     bigdecimal (3.1.8)
     buildkit (1.6.0)
       sawyer (>= 0.6)
@@ -51,10 +53,10 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.15.2)
+    cocoapods (1.16.1)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.16.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -68,8 +70,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
+      xcodeproj (>= 1.26.0, < 2.0)
+    cocoapods-core (1.16.1)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -273,7 +275,7 @@ GEM
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.7.5)
     jwt (2.9.0)
       base64
     kramdown (2.4.0)
@@ -289,7 +291,7 @@ GEM
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
@@ -377,13 +379,13 @@ GEM
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.26.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)

diff --git a/Podfile b/Podfile
@@ -112,6 +112,7 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['CODE_SIGN_IDENTITY'] = ''
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
     end
   end
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -27,6 +27,6 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
   WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
 
-PODFILE CHECKSUM: f30ae9db730f660b2c300f7761c19ab78f244d90
+PODFILE CHECKSUM: 99aff5ecb96391804fd8f28b29fd4e350ecd4b2e
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.1
diff --git a/WordPress/Classes/ViewRelated/Aztec/Extensions/Header+WordPress.swift b/WordPress/Classes/ViewRelated/Aztec/Extensions/Header+WordPress.swift
@@ -16,6 +16,7 @@ extension Header.HeaderType {
         case .h4:   return FormattingIdentifier.header4
         case .h5:   return FormattingIdentifier.header5
         case .h6:   return FormattingIdentifier.header6
+        @unknown default: fatalError()
         }
     }
 
@@ -28,6 +29,7 @@ extension Header.HeaderType {
         case .h4: return AppLocalizedString("Heading 4", comment: "H4 Aztec Style")
         case .h5: return AppLocalizedString("Heading 5", comment: "H5 Aztec Style")
         case .h6: return AppLocalizedString("Heading 6", comment: "H6 Aztec Style")
+        @unknown default: fatalError()
         }
     }
 
@@ -40,6 +42,7 @@ extension Header.HeaderType {
         case .h4: return AppLocalizedString("Switches to the Heading 4 font size", comment: "Accessibility Identifier for the H4 Aztec Style")
         case .h5: return AppLocalizedString("Switches to the Heading 5 font size", comment: "Accessibility Identifier for the H5 Aztec Style")
         case .h6: return AppLocalizedString("Switches to the Heading 6 font size", comment: "Accessibility Identifier for the H6 Aztec Style")
+        @unknown default: fatalError()
         }
     }
 

diff --git a/WordPress/Classes/ViewRelated/Aztec/Extensions/TextList+WordPress.swift b/WordPress/Classes/ViewRelated/Aztec/Extensions/TextList+WordPress.swift
@@ -9,20 +9,23 @@ extension TextList.Style {
         switch self {
         case .ordered:   return FormattingIdentifier.orderedlist
         case .unordered: return FormattingIdentifier.unorderedlist
+        @unknown default: fatalError()
         }
     }
 
     var description: String {
         switch self {
         case .ordered: return "Ordered List"
         case .unordered: return "Unordered List"
+        @unknown default: fatalError()
         }
     }
 
     var accessibilityLabel: String {
         switch self {
         case .ordered: return AppLocalizedString("Toggles the ordered list style", comment: "Accessibility Identifier for the Aztec Ordered List Style.")
         case .unordered: return AppLocalizedString("Toggles the unordered list style", comment: "Accessibility Identifier for the Aztec Unordered List Style")
+        @unknown default: fatalError()
         }
     }