Revert "ci: remove CocoaPods"

This reverts commit 54e667f.

Author: pylapp

.github/DEVELOP.md

@@ -39,7 +39,7 @@
 > [!IMPORTANT]
 > You should check wether or not you have the tools in use in the project like Fastlane, SwiftLint, SwiftFormat, etc.
 > You can have a look for example in the THIRD_PARTY.md file which lists any dependencies and tools we use at different levels (SDK, design system toolbox app, project).
-> Have a look on the locks file to know which versions we are using (Gemfile, Gemfile.lock, etc.).
+> Have a look on the locks file to know which versions we are using (Podfile, Podfile.lock, Gemfile, Gemfile.lock, etc.).
 
 > [!IMPORTANT]
 > We use a lot Fastlane for its automatic features and also to wrap to Shell command lines in order to have the same command to trigger
@@ -59,6 +59,9 @@ brew install rbenv
 # Use Bundler to install a major part of dependencies (thanks to Gemfile and Gemfile.lock files)
 bundle install
 
+# Use CocoaPods to install other dependencies not available as rubygems (thanks to Podfile and Podfile.lock files)
+bundle exec pod install --repo-update
+
 # Update your references
 brew update
 
@@ -153,9 +156,10 @@ You should not add in your VCS tool the *{$PROJET}.xcworkspace/contents.xcworksp
 To build the demo application follow those steps:
 
 1. `cd DesignToolbox`
-2. Open *DesignToolbox.xcworkspace*
-3. Select *DesignToolbox* scheme
-4. Build and run the Application on your device ou simulator
+2. `bundle exec pod install`
+3. Open *DesignToolbox.xcworkspace*
+4. Select *DesignToolbox* scheme
+5. Build and run the Application on your device ou simulator
 
 > [!TIP]
 > You can also move the folder containing a clone of the [Swift package repository](https://github.com/Orange-OpenSource/ouds-ios) from the *Finder* to the design system toolbox Xcode project so as to have a local reference of the package in this demo app.
@@ -211,10 +215,11 @@ The snapshots tests are made to test the rendering of the components and tokens,
 
 To run these snapshots tests follow some steps:
 1. `cd DesignToolbox`
-2. Open *DesignToolbox.xcworkspace*
-3. Select *DesignToolboxSnapshotsTests* scheme
-4. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
-5. Run tests (Product -> Test)
+2. `bundle exec pod install`
+3. Open *DesignToolbox.xcworkspace*
+4. Select *DesignToolboxSnapshotsTests* scheme
+5. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
+6. Run tests (Product -> Test)
 
 Or run in terminal:
 ```shell
@@ -293,10 +298,11 @@ The project contains some UI tests made to test the behavior of components.
 
 To run these UI tests follow some steps:
 1. `cd DesignToolbox`
-2. Open *DesignToolbox.xcworkspace*
-3. Select *DesignToolboxUITests* scheme
-4. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
-5. Run tests (Product -> Test)
+2. `bundle exec pod install`
+3. Open *DesignToolbox.xcworkspace*
+4. Select *DesignToolboxUITests* scheme
+5. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
+6. Run tests (Product -> Test)
 
 Or run in terminal:
 ```shell
@@ -309,9 +315,10 @@ The project contains some unit tests made to test the behavior of some utils in
 
 To run these UI tests follow some steps:
 1. `cd DesignToolbox`
-2. Open *DesignToolbox.xcworkspace*
-3. Select *DesignToolboxUnitTests* scheme
-4. Run tests in left pane (target *DesignToolboxUnitTests*)
+2. `bundle exec pod install`
+3. Open *DesignToolbox.xcworkspace*
+4. Select *DesignToolboxUnitTests* scheme
+5. Run tests in left pane (target *DesignToolboxUnitTests*)
 
 Or run in terminal:
 ```shell
@@ -362,7 +369,13 @@ Sometimes dependencies should be updated, with for example warnings of [Renovate
 
 Here is the list of files to update to keep the project clean:
 - CHANGELOG (to note for releases the update of the version)
-- Of course, update and save in your VCS the new states of the _Package.swift_ or _Gemfile_ for example (and do not forget locks!)
+- Of course, update and save in your VCS the new states of the _Podfile_, _Package.swift_ or _Gemfile_ for example (and do not forget locks!)
+
+Maybe you will need to update your pods repo before if you updated a Pod:
+
+```shell
+bundle exec pod install --repo-update
+```
 
 ## Developer Certificate of Origin
 

.github/workflows/build-and-test.yml

@@ -91,6 +91,7 @@ jobs:
       - name: Run UI-based unit tests on demo app
         run: |
           cd DesignToolbox
+          bundle exec pod install
           bundle exec fastlane test_ui
 
   # Test the library with snapshots tests
@@ -116,5 +117,6 @@ jobs:
       - name: Run snapshots tests on demo app
         run: |
           cd DesignToolbox
+          bundle exec pod install
           xcrun simctl list # List available simulators
           bundle exec fastlane test_snapshots

.github/workflows/periphery.yml

@@ -63,4 +63,5 @@ jobs:
       - name: Look for dead code
         run: |
           cd DesignToolbox
+          bundle exec pod install
           bundle exec fastlane check_dead_code

.gitignore

@@ -22,6 +22,9 @@
 # Produced by Brew
 /Brewfile.lock.json
 
+# Produced by CocoaPods
+/DesignToolbox/Pods/
+
 # Produced by Xcode
 /DesignToolbox/DesignToolbox.xcodeproj/xcuserdata/
 /DesignToolbox/DesignToolbox.xcodeproj/project.xcworkspace/xcuserdata/

.swiftformat

@@ -13,7 +13,7 @@
 
 --swiftversion 6.2
 
---exclude Resources/CodeGen/**
+--exclude Resources/CodeGen/**,Pods/**
 
 --disable blankLinesAroundMark,blankLinesAtStartOfScope,redundantRawValues,modifierOrder
 

.swiftlint.yml

@@ -30,6 +30,7 @@ included:
 excluded:
 - DesignToolbox/DesignToolbox/Info.plist
 - DesignToolbox/DesignToolbox/Resources
+- DesignToolbox/Pods
 - DesignToolbox/DerivedData
 
 # ==============

DesignToolbox/DesignToolbox.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -287,6 +287,10 @@ platform :ios do
     lane :build_debug do
         puts "👉 Build debug app"
 
+        cocoapods(
+          clean_install: true
+        )
+
         Dir.chdir "../#{OUDS_PROJECT_NAME}/Resources/Assets.xcassets" do
             sh "rm -Rf AppIconRelease.appiconset"
             sh "cp -R AppIconDebug.appiconset AppIconRelease.appiconset"
@@ -493,6 +497,10 @@ platform :ios do
                 app_identifier: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
             )
 
+            cocoapods(
+                clean_install: true
+            )
+
             # Disable automatic code signing for release / distribution builds.
             # Thus we won't use any Xcode with plugged account in, and use only needed certificates and provisioning profiles.
             # Mobile provisioning profile named "OUDS demo app (release)" must be placed in runner.

DesignToolbox/fastlane/Fastfile

@@ -32,6 +32,7 @@ gem 'abbrev', '0.1.2'
 gem 'fastlane', '2.228.0'
 gem 'fastlane-plugin-changelog', '0.16.0'
 gem 'fastlane-plugin-mattermost', '1.3.2'
+gem 'cocoapods', '1.16.2'
 gem 'json', '2.15.1'
 gem 'net-http', '0.6.0'
 gem 'xcode-install', '2.8.1'

Gemfile

@@ -6,8 +6,23 @@ GEM
       nkf
       rexml
     abbrev (0.1.2)
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
@@ -30,17 +45,62 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     claide (1.1.0)
+    cocoapods (1.16.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.16.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
+    drb (2.2.1)
     emoji_regex (3.2.3)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
     excon (0.112.0)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
@@ -117,6 +177,19 @@ GEM
     fastlane-plugin-mattermost (1.3.2)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86-linux-gnu)
+    ffi (1.17.1-x86-linux-musl)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -159,20 +232,26 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.9.0)
       mutex_m
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.15.1)
     jwt (2.10.1)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
+    minitest (5.25.5)
+    molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
+    nap (1.1.0)
     naturally (2.2.2)
     net-http (0.6.0)
       uri
+    netrc (0.11.0)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
@@ -186,8 +265,10 @@ GEM
     retriable (3.1.2)
     rexml (3.4.1)
     rouge (3.28.0)
+    ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
+    securerandom (0.4.1)
     security (0.1.5)
     signet (0.20.0)
       addressable (~> 2.8)
@@ -206,6 +287,10 @@ GEM
     tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
     uri (1.0.4)
@@ -239,6 +324,7 @@ PLATFORMS
 
 DEPENDENCIES
   abbrev (= 0.1.2)
+  cocoapods (= 1.16.2)
   fastlane (= 2.228.0)
   fastlane-plugin-changelog (= 0.16.0)
   fastlane-plugin-mattermost (= 1.3.2)