[Up for adoption] Bumping xcode to make the build work again

.github/workflows/ios-release.yml

@@ -32,6 +32,12 @@ jobs:
 
       - name: Prepare xcodeproj
         run: sh scripts/setup.sh
+
+     # - name: Custom Carthage for Xcode12
+        #run: sh scripts/carthage-build.sh build --platform iOS --no-use-binaries libPhoneNumber-iOS
+        #and I generated the framework with all the architectures that I need
+        #lipo -info Carthage/Build/iOS/libPhoneNumberiOS.framework/libPhoneNumberiOS
+        #architectures in the fat file: Carthage/Build/iOS/libPhoneNumberiOS.framework/libPhoneNumberiOS are: armv7 i386 x86_64 arm64
 
       - name: Run Fastlane beta lane
         run: bundle exec fastlane beta

Cartfile.resolved

@@ -3,17 +3,17 @@ github "Alamofire/AlamofireImage" "3.5.2"
 github "AliSoftware/OHHTTPStubs" "7.0.0"
 github "Daltron/NotificationBanner" "3.0.0"
 github "DaveWoodCom/XCGLogger" "7.0.0"
-github "Quick/Nimble" "v8.0.5"
-github "Quick/Quick" "v2.2.0"
+github "Quick/Nimble" "v9.2.0"
+github "Quick/Quick" "v4.0.0"
 github "SVProgressHUD/SVProgressHUD" "2.2.5"
 github "SnapKit/SnapKit" "5.0.1"
 github "TimOliver/TOCropViewController" "2.5.1"
 github "Tovkal/ImageViewer" "0.1.4"
 github "alexaubry/BulletinBoard" "4.1.0"
-github "cbpowell/MarqueeLabel" "4.0.2"
+github "cbpowell/MarqueeLabel" "4.1.0"
 github "getsentry/sentry-cocoa" "5.2.2"
 github "hackiftekhar/IQKeyboardManager" "v5.0.6"
-github "httpswift/swifter" "74d111d6bab7ccbfb5284b68d52ffb56f0f0d903"
+github "httpswift/swifter" "718f82c26aa2ba558345d14e0730aba1266a1130"
 github "jaharabari/IBLocalizable" "09b4c187aa9d1a126b6215610964f179536ae0a9"
 github "kishikawakatsumi/KeychainAccess" "v3.2.0"
 github "marmelroy/Zip" "1.1.0"

Gemfile.lock

@@ -1,59 +1,70 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
+    CFPropertyList (3.0.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.399.0)
-    aws-sdk-core (3.109.3)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.467.0)
+    aws-sdk-core (3.114.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.85.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.96.1)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     blockenspiel (0.5.0)
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
     declarative (0.0.20)
-    declarative-option (0.1.0)
-    digest-crc (0.6.1)
-      rake (~> 13.0)
+    digest-crc (0.6.3)
+      rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.2.1)
-    excon (0.78.0)
-    faraday (1.1.0)
+    emoji_regex (3.2.2)
+    excon (0.82.0)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.168.0)
+    fastimage (2.2.4)
+    fastlane (2.185.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
+      artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -62,18 +73,19 @@ GEM
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.37.0, < 0.39.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.1)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (~> 2.0.0)
+      naturally (~> 2.2)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (>= 0.6.3, < 1.0.0)
@@ -82,75 +94,87 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-sentry (1.6.0)
+    fastlane-plugin-sentry (1.8.1)
     gh_inspector (1.1.3)
-    google-api-client (0.38.0)
+    google-apis-androidpublisher_v3 (0.5.0)
+      google-apis-core (~> 0.1)
+    google-apis-core (0.3.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
+      googleauth (~> 0.14)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-core (1.5.0)
+      rexml
+      signet (~> 0.14)
+      webrick
+    google-apis-iamcredentials_v1 (0.4.0)
+      google-apis-core (~> 0.1)
+    google-apis-playcustomapp_v1 (0.3.0)
+      google-apis-core (~> 0.1)
+    google-apis-storage_v1 (0.4.0)
+      google-apis-core (~> 0.1)
+    google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.4.0)
+    google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.1)
-    google-cloud-storage (1.29.1)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.31.1)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.14.0)
+    googleauth (0.16.2)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    highline (1.7.10)
-    http-cookie (1.0.3)
+    highline (2.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.4.0)
-    json (2.3.1)
-    jwt (2.2.2)
+    json (2.5.1)
+    jwt (2.2.3)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.0.2)
+    mini_mime (1.1.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
-    naturally (2.2.0)
+    naturally (2.2.1)
     os (1.1.1)
-    plist (3.5.0)
+    plist (3.6.0)
     public_suffix (4.0.6)
-    rake (13.0.1)
-    representable (3.0.4)
+    rake (13.0.3)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.5)
     rouge (2.0.7)
-    ruby2_keywords (0.0.2)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
     security (0.1.3)
-    signet (0.14.0)
+    signet (0.15.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
       CFPropertyList
       naturally
-    slack-notifier (2.3.2)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -162,8 +186,9 @@ GEM
     unicode-display_width (1.7.0)
     versionomy (0.5.0)
       blockenspiel (~> 0.5)
+    webrick (1.7.0)
     word_wrap (1.0.0)
-    xcode-install (2.6.7)
+    xcode-install (2.7.0)
       claide (>= 0.9.1, < 1.1.0)
       fastlane (>= 2.1.0, < 3.0.0)
     xcodeproj (1.19.0)
@@ -174,7 +199,7 @@ GEM
       nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
+    xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS

Mintfile

@@ -1,2 +1,2 @@
 yonaskolb/xcodegen@2.14.0
-carthage/carthage@0.34.0
+carthage/carthage@0.38.0

OpenFoodFacts.entitlements

@@ -7,4 +7,4 @@
 		<string>product:*.openfoodfacts.org</string>
 	</array>
 </dict>
-</plist>
+</plist>

Sources/Extensions/String.swift

@@ -39,6 +39,21 @@ extension String {
         return decoded ?? self
     }
 
+    func searchBetweenRegexes(from endOfRegexA: String, to endOfRegexB: String) throws -> String? {
+        guard endOfRegexB.contains(endOfRegexA) else {
+            throw NSError(domain: "RegexB must contain RegexA to find the difference between them", code: Errors.codes.regexSearchStringError.rawValue)
+        }
+
+        let startIndex = self.range(of: endOfRegexA, options: .regularExpression)?.upperBound
+        let endIndex = self.range(of: endOfRegexB, options: .regularExpression)?.upperBound
+        if let start = startIndex, let end = endIndex {
+            let result = self[start..<end]
+            return String(result)
+        }
+
+        return nil
+    }
+
 }
 
 extension String: Pickable {

Sources/Models/Common/AttributeTableRow.swift

@@ -0,0 +1,18 @@
+//
+//  AttributeTableRow.swift
+//  OpenFoodFacts
+//
+//  Created by Alexander Scott Beaty on 11/6/20.
+//
+
+import Foundation
+
+struct AttributeTableRow {
+    weak var delegate: AttributeTableViewCellDelegate?
+    let attribute: Attribute?
+
+    init(_ delegate: AttributeTableViewCellDelegate?, attribute: Attribute?) {
+        self.delegate = delegate
+        self.attribute = attribute
+    }
+}

Sources/Models/Common/Form.swift

@@ -23,7 +23,8 @@ struct Form {
             ProductDetailWebViewTableViewCell.self,
             SummaryHeaderCell.self,
             SummaryFooterCell.self,
-            HostedViewCell.self
+            HostedViewCell.self,
+            AttributeTableViewCell.self
         ]
     }
 }

Sources/Models/ErrorCodes.swift

@@ -15,5 +15,6 @@ struct Errors {
     enum codes: Int {
         case generic = 1
         case wrongCredentials = 2
+        case regexSearchStringError = 3
     }
 }