Update Kingfisher 6.x to 7.x (#98)

kimura-developer · web-flow · commit eb1bf23d1a25 · 2023-12-19T13:26:42.000-07:00
Upgrade Kingfisher library to 7.x
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
+## Pending on develop
+
+##### Bug Fixes
+* Update Kingfisher library to latest 7.x.
+* Update references to Kingfisher's `ImageResource` struct because Xcode 15 introduced a conflicting `ImageResource` symbol.
+
 ## 4.0.6
 
 ##### Features
diff --git a/MAGE.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MAGE.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Mage/AttachmentUIImageView.swift b/Mage/AttachmentUIImageView.swift
@@ -193,7 +193,7 @@ import Kingfisher
                     largeUrl = URL(string: String(format: "%@_large", attachmentUrl)) ?? url
                 }
                 DispatchQueue.main.async {
-                    let resource = Kingfisher.ImageResource(downloadURL: self.getAttachmentUrl(size: self.getImageSize())!, cacheKey: largeUrl.absoluteString)
+                    let resource = KF.ImageResource(downloadURL: self.getAttachmentUrl(size: self.getImageSize())!, cacheKey: largeUrl.absoluteString)
                     self.kf.setImage(with: resource, placeholder: placeholder, options: options, progressBlock: progressBlock) { result in
                         
                         switch result {
@@ -211,7 +211,7 @@ import Kingfisher
             } else {
                 // Have to do this so that the placeholder image shows up behind the activity indicator
                 DispatchQueue.main.async {
-                    let resource = Kingfisher.ImageResource(downloadURL: self.getAttachmentUrl(size: self.getImageSize())!, cacheKey: thumbUrl.absoluteString)
+                    let resource = KF.ImageResource(downloadURL: self.getAttachmentUrl(size: self.getImageSize())!, cacheKey: thumbUrl.absoluteString)
                     self.kf.setImage(with: resource, placeholder: placeholder, options: options, progressBlock: progressBlock) { result in
                         
                         switch result {
@@ -237,7 +237,7 @@ import Kingfisher
             if let attachmentUrl = self.attachment?.url {
                 largeUrl = URL(string: String(format: "%@_large", attachmentUrl)) ?? url
             }
-            let resource = Kingfisher.ImageResource(downloadURL: self.getAttachmentUrl(size: getImageSize())!, cacheKey: largeUrl.absoluteString)
+            let resource = KF.ImageResource(downloadURL: self.getAttachmentUrl(size: getImageSize())!, cacheKey: largeUrl.absoluteString)
 
             placeholder.kf.setImage(with: resource, options: options) { result in
                 
diff --git a/Podfile b/Podfile
@@ -14,7 +14,7 @@ def common_pods
   pod 'DateTools', '~> 2.0.0'
   pod 'MaterialComponents'
   pod 'MDFInternationalization'
-  pod 'Kingfisher', '~> 6'
+  pod 'Kingfisher', '~> 7.0'
   pod 'PureLayout'
   pod "AFNetworking", "~> 4.0.1"
   pod "DateTools", "~> 2.0.0"
diff --git a/Podfile.lock b/Podfile.lock
@@ -33,7 +33,7 @@ PODS:
   - KIF (3.8.9):
     - KIF/Core (= 3.8.9)
   - KIF/Core (3.8.9)
-  - Kingfisher (6.3.1)
+  - Kingfisher (7.10.1)
   - libPhoneNumber-iOS (0.9.15)
   - MagicalRecord (2.3.2):
     - MagicalRecord/Core (= 2.3.2)
@@ -734,7 +734,7 @@ DEPENDENCIES:
   - geopackage-ios (~> 8.0.4)
   - HexColors (~> 4.0.0)
   - KIF
-  - Kingfisher (~> 6)
+  - Kingfisher (~> 7.0)
   - libPhoneNumber-iOS (~> 0.9.15)
   - MagicalRecord (~> 2.3.2)
   - MaterialComponents
@@ -809,7 +809,7 @@ SPEC CHECKSUMS:
   grid-ios: a86f1d0e90c6ae2721ec3abcf1763a2d300ab19b
   HexColors: 5f95843ef89aff6a72e1fd3a8ebabf205cc43379
   KIF: 7660c626b0f2d4562533590960db70a36d640558
-  Kingfisher: 016c8b653a35add51dd34a3aba36b580041acc74
+  Kingfisher: bc5abe80a8e0144537ef1dd5a0b2621b04f7f439
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
   MaterialComponents: 1a9b2d9d45b1601ae544de85089adc4c464306d4
@@ -837,6 +837,6 @@ SPEC CHECKSUMS:
   UIImage-Categories: 5103b772ae91894f4d650eb696b006f4a2487ec3
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
 
-PODFILE CHECKSUM: 1683a1f1f6e7a14f370fb9f7f3f7688e8c9a038e
+PODFILE CHECKSUM: 89eca234d687507258e09eaade442fa4c43c1e1f
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.12.1
diff --git a/sdk/Model1To15.xcmappingmodel/xcmapping.xml b/sdk/Model1To15.xcmappingmodel/xcmapping.xml
@@ -10,7 +10,7 @@
             <plist version="1.0">
                 <dict>
                     <key>NSPersistenceFrameworkVersion</key>
-                    <integer>866</integer>
+                    <integer>1251</integer>
                     <key>NSStoreModelVersionHashes</key>
                     <dict>
                         <key>XDDevAttributeMapping</key>
@@ -34,6 +34,8 @@
 		akYY9LhehVA/mCb4ATLWuI9XGLcjpm14wWL1oEBtIcs=
 		</data>
                     </dict>
+                    <key>NSStoreModelVersionHashesDigest</key>
+                    <string>+Hmc2uYZK6og+Pvx5GUJ7oW75UG4V/ksQanTjfTKUnxyGWJRMtB5tIRgVwGsrd7lz/QR57++wbvWsr6nxwyS0A==</string>
                     <key>NSStoreModelVersionHashesVersion</key>
                     <integer>3</integer>
                     <key>NSStoreModelVersionIdentifiers</key>
@@ -58,11 +60,11 @@
     </object>
     <object type="XDDEVENTITYMAPPING" id="z105">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">10</attribute>
+        <attribute name="mappingnumber" type="int16">8</attribute>
         <attribute name="destinationname" type="string">StaticLayer</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z166 z145 z108 z186 z182 z161 z111 z116 z192 z165 z132"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z111 z108 z166 z161 z182 z186 z116 z145 z192 z165 z132"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING"></relationship>
     </object>
     <object type="XDDEVATTRIBUTEMAPPING" id="z106">
@@ -103,11 +105,11 @@
     </object>
     <object type="XDDEVENTITYMAPPING" id="z115">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">12</attribute>
+        <attribute name="mappingnumber" type="int16">10</attribute>
         <attribute name="destinationname" type="string">ObservationFavorite</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z212 z194 z170"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z170 z212 z194"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z118"></relationship>
     </object>
     <object type="XDDEVATTRIBUTEMAPPING" id="z116">
@@ -150,7 +152,7 @@
     </object>
     <object type="XDDEVENTITYMAPPING" id="z125">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">6</attribute>
+        <attribute name="mappingnumber" type="int16">5</attribute>
         <attribute name="destinationname" type="string">Server</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
@@ -163,11 +165,11 @@
     </object>
     <object type="XDDEVENTITYMAPPING" id="z127">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">14</attribute>
+        <attribute name="mappingnumber" type="int16">12</attribute>
         <attribute name="destinationname" type="string">ObservationImportant</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z123 z201 z150 z156 z147"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z201 z156 z150 z147 z123"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z202"></relationship>
     </object>
     <object type="XDDEVRELATIONSHIPMAPPING" id="z128">
@@ -269,7 +271,7 @@
     </object>
     <object type="XDDEVENTITYMAPPING" id="z151">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">4</attribute>
+        <attribute name="mappingnumber" type="int16">3</attribute>
         <attribute name="destinationname" type="string">Role</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
@@ -288,11 +290,11 @@
     <object type="XDDEVENTITYMAPPING" id="z154">
         <attribute name="sourcename" type="string">User</attribute>
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">11</attribute>
+        <attribute name="mappingnumber" type="int16">9</attribute>
         <attribute name="destinationname" type="string">User</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z204 z157 z113 z129 z130 z104 z131 z175 z195 z148"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z175 z104 z113 z131 z195 z148 z129 z157 z204 z130"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING"></relationship>
     </object>
     <object type="XDDEVATTRIBUTEMAPPING" id="z155">
@@ -414,7 +416,7 @@ cBIAAYagrxEKFAAHAAgAFwAzADQANQBXAFgAWQBaAFsAXABdAF4AXwBgAGEAYgBjAGQAZQCAAIEAggCI
     </object>
     <object type="XDDEVENTITYMAPPING" id="z180">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">5</attribute>
+        <attribute name="mappingnumber" type="int16">4</attribute>
         <attribute name="destinationname" type="string">Canary</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
@@ -439,11 +441,11 @@ cBIAAYagrxEKFAAHAAgAFwAzADQANQBXAFgAWQBaAFsAXABdAF4AXwBgAGEAYgBjAGQAZQCAAIEAggCI
     </object>
     <object type="XDDEVENTITYMAPPING" id="z185">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">2</attribute>
+        <attribute name="mappingnumber" type="int16">1</attribute>
         <attribute name="destinationname" type="string">Team</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z141 z136 z134"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z134 z141 z136"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z158 z128"></relationship>
     </object>
     <object type="XDDEVATTRIBUTEMAPPING" id="z186">
@@ -470,22 +472,22 @@ cBIAAYagrxEKFAAHAAgAFwAzADQANQBXAFgAWQBaAFsAXABdAF4AXwBgAGEAYgBjAGQAZQCAAIEAggCI
     </object>
     <object type="XDDEVENTITYMAPPING" id="z190">
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">13</attribute>
+        <attribute name="mappingnumber" type="int16">11</attribute>
         <attribute name="destinationname" type="string">Event</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z167 z172 z214 z121 z102 z149"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z167 z121 z102 z172 z214 z149"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z119"></relationship>
     </object>
     <object type="XDDEVENTITYMAPPING" id="z191">
         <attribute name="sourcename" type="string">Observation</attribute>
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">7</attribute>
+        <attribute name="mappingnumber" type="int16">6</attribute>
         <attribute name="destinationname" type="string">Observation</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z209 z162 z140 z205 z143 z177 z197 z139 z183 z159 z155 z152"></relationship>
-        <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z142 z179 z206 z178"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z159 z183 z139 z155 z177 z143 z162 z209 z140 z152 z197 z205"></relationship>
+        <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z179 z206 z142 z178"></relationship>
     </object>
     <object type="XDDEVATTRIBUTEMAPPING" id="z192">
         <attribute name="name" type="string">url</attribute>
@@ -568,11 +570,11 @@ cBIAAYagrxEKFAAHAAgAFwAzADQANQBXAFgAWQBaAFsAXABdAF4AXwBgAGEAYgBjAGQAZQCAAIEAggCI
     <object type="XDDEVENTITYMAPPING" id="z211">
         <attribute name="sourcename" type="string">Layer</attribute>
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">3</attribute>
+        <attribute name="mappingnumber" type="int16">2</attribute>
         <attribute name="destinationname" type="string">Layer</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z120 z171 z169 z124 z135 z208 z103 z107 z144 z164"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z164 z124 z171 z107 z135 z144 z103 z169 z208 z120"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING"></relationship>
     </object>
     <object type="XDDEVATTRIBUTEMAPPING" id="z212">
@@ -594,11 +596,11 @@ cBIAAYagrxEKFAAHAAgAFwAzADQANQBXAFgAWQBaAFsAXABdAF4AXwBgAGEAYgBjAGQAZQCAAIEAggCI
     <object type="XDDEVENTITYMAPPING" id="z216">
         <attribute name="sourcename" type="string">Attachment</attribute>
         <attribute name="mappingtypename" type="string">Undefined</attribute>
-        <attribute name="mappingnumber" type="int16">9</attribute>
+        <attribute name="mappingnumber" type="int16">7</attribute>
         <attribute name="destinationname" type="string">Attachment</attribute>
         <attribute name="autogenerateexpression" type="bool">1</attribute>
         <relationship name="mappingmodel" type="1/1" destination="XDDEVMAPPINGMODEL" idrefs="z173"></relationship>
-        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z187 z109 z126 z114 z110 z168 z184 z193 z200 z213 z163 z198"></relationship>
+        <relationship name="attributemappings" type="0/0" destination="XDDEVATTRIBUTEMAPPING" idrefs="z168 z198 z110 z193 z184 z213 z114 z187 z200 z109 z163 z126"></relationship>
         <relationship name="relationshipmappings" type="0/0" destination="XDDEVRELATIONSHIPMAPPING" idrefs="z146"></relationship>
     </object>
     <object type="XDDEVRELATIONSHIPMAPPING" id="z217">
