Skip to content

Commit 54e667f

Browse files
committed
ci: remove CocoaPods
Signed-off-by: Pierre-Yves Lapersonne <[email protected]>
1 parent 33fa728 commit 54e667f

File tree

11 files changed

+20
-142
lines changed

11 files changed

+20
-142
lines changed

.github/DEVELOP.md

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
> [!IMPORTANT]
4040
> You should check wether or not you have the tools in use in the project like Fastlane, SwiftLint, SwiftFormat, etc.
4141
> 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).
42-
> Have a look on the locks file to know which versions we are using (Podfile, Podfile.lock, Gemfile, Gemfile.lock, etc.).
42+
> Have a look on the locks file to know which versions we are using (Gemfile, Gemfile.lock, etc.).
4343
4444
> [!IMPORTANT]
4545
> 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,9 +59,6 @@ brew install rbenv
5959
# Use Bundler to install a major part of dependencies (thanks to Gemfile and Gemfile.lock files)
6060
bundle install
6161

62-
# Use CocoaPods to install other dependencies not available as rubygems (thanks to Podfile and Podfile.lock files)
63-
bundle exec pod install --repo-update
64-
6562
# Update your references
6663
brew update
6764

@@ -156,10 +153,9 @@ You should not add in your VCS tool the *{$PROJET}.xcworkspace/contents.xcworksp
156153
To build the demo application follow those steps:
157154

158155
1. `cd DesignToolbox`
159-
2. `bundle exec pod install`
160-
3. Open *DesignToolbox.xcworkspace*
161-
4. Select *DesignToolbox* scheme
162-
5. Build and run the Application on your device ou simulator
156+
2. Open *DesignToolbox.xcworkspace*
157+
3. Select *DesignToolbox* scheme
158+
4. Build and run the Application on your device ou simulator
163159

164160
> [!TIP]
165161
> 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.
@@ -215,11 +211,10 @@ The snapshots tests are made to test the rendering of the components and tokens,
215211

216212
To run these snapshots tests follow some steps:
217213
1. `cd DesignToolbox`
218-
2. `bundle exec pod install`
219-
3. Open *DesignToolbox.xcworkspace*
220-
4. Select *DesignToolboxSnapshotsTests* scheme
221-
5. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
222-
6. Run tests (Product -> Test)
214+
2. Open *DesignToolbox.xcworkspace*
215+
3. Select *DesignToolboxSnapshotsTests* scheme
216+
4. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
217+
5. Run tests (Product -> Test)
223218

224219
Or run in terminal:
225220
```shell
@@ -298,11 +293,10 @@ The project contains some UI tests made to test the behavior of components.
298293
299294
To run these UI tests follow some steps:
300295
1. `cd DesignToolbox`
301-
2. `bundle exec pod install`
302-
3. Open *DesignToolbox.xcworkspace*
303-
4. Select *DesignToolboxUITests* scheme
304-
5. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
305-
6. Run tests (Product -> Test)
296+
2. Open *DesignToolbox.xcworkspace*
297+
3. Select *DesignToolboxUITests* scheme
298+
4. Select *iPhone 17 Pro* simulator (the device used to tests and views rendering) (iOS 26.0 (23A339))
299+
5. Run tests (Product -> Test)
306300
307301
Or run in terminal:
308302
```shell
@@ -315,10 +309,9 @@ The project contains some unit tests made to test the behavior of some utils in
315309

316310
To run these UI tests follow some steps:
317311
1. `cd DesignToolbox`
318-
2. `bundle exec pod install`
319-
3. Open *DesignToolbox.xcworkspace*
320-
4. Select *DesignToolboxUnitTests* scheme
321-
5. Run tests in left pane (target *DesignToolboxUnitTests*)
312+
2. Open *DesignToolbox.xcworkspace*
313+
3. Select *DesignToolboxUnitTests* scheme
314+
4. Run tests in left pane (target *DesignToolboxUnitTests*)
322315

323316
Or run in terminal:
324317
```shell
@@ -369,13 +362,7 @@ Sometimes dependencies should be updated, with for example warnings of [Renovate
369362

370363
Here is the list of files to update to keep the project clean:
371364
- CHANGELOG (to note for releases the update of the version)
372-
- 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!)
373-
374-
Maybe you will need to update your pods repo before if you updated a Pod:
375-
376-
```shell
377-
bundle exec pod install --repo-update
378-
```
365+
- Of course, update and save in your VCS the new states of the _Package.swift_ or _Gemfile_ for example (and do not forget locks!)
379366

380367
## Developer Certificate of Origin
381368

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ jobs:
9191
- name: Run UI-based unit tests on demo app
9292
run: |
9393
cd DesignToolbox
94-
bundle exec pod install
9594
bundle exec fastlane test_ui
9695
9796
# Test the library with snapshots tests
@@ -117,6 +116,5 @@ jobs:
117116
- name: Run snapshots tests on demo app
118117
run: |
119118
cd DesignToolbox
120-
bundle exec pod install
121119
xcrun simctl list # List available simulators
122120
bundle exec fastlane test_snapshots

.github/workflows/periphery.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,4 @@ jobs:
6363
- name: Look for dead code
6464
run: |
6565
cd DesignToolbox
66-
bundle exec pod install
6766
bundle exec fastlane check_dead_code

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
# Produced by Brew
2323
/Brewfile.lock.json
2424

25-
# Produced by CocoaPods
26-
/DesignToolbox/Pods/
27-
2825
# Produced by Xcode
2926
/DesignToolbox/DesignToolbox.xcodeproj/xcuserdata/
3027
/DesignToolbox/DesignToolbox.xcodeproj/project.xcworkspace/xcuserdata/

.swiftformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
--swiftversion 6.2
1515

16-
--exclude Resources/CodeGen/**,Pods/**
16+
--exclude Resources/CodeGen/**
1717

1818
--disable blankLinesAroundMark,blankLinesAtStartOfScope,redundantRawValues,modifierOrder
1919

.swiftlint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ included:
3030
excluded:
3131
- DesignToolbox/DesignToolbox/Info.plist
3232
- DesignToolbox/DesignToolbox/Resources
33-
- DesignToolbox/Pods
3433
- DesignToolbox/DerivedData
3534

3635
# ==============

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

DesignToolbox/fastlane/Fastfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,6 @@ platform :ios do
287287
lane :build_debug do
288288
puts "👉 Build debug app"
289289

290-
cocoapods(
291-
clean_install: true
292-
)
293-
294290
Dir.chdir "../#{OUDS_PROJECT_NAME}/Resources/Assets.xcassets" do
295291
sh "rm -Rf AppIconRelease.appiconset"
296292
sh "cp -R AppIconDebug.appiconset AppIconRelease.appiconset"
@@ -497,10 +493,6 @@ platform :ios do
497493
app_identifier: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
498494
)
499495

500-
cocoapods(
501-
clean_install: true
502-
)
503-
504496
# Disable automatic code signing for release / distribution builds.
505497
# Thus we won't use any Xcode with plugged account in, and use only needed certificates and provisioning profiles.
506498
# Mobile provisioning profile named "OUDS demo app (release)" must be placed in runner.

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ gem 'abbrev', '0.1.2'
3232
gem 'fastlane', '2.228.0'
3333
gem 'fastlane-plugin-changelog', '0.16.0'
3434
gem 'fastlane-plugin-mattermost', '1.3.2'
35-
gem 'cocoapods', '1.16.2'
3635
gem 'json', '2.15.1'
3736
gem 'net-http', '0.6.0'
3837
gem 'xcode-install', '2.8.1'

Gemfile.lock

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,8 @@ GEM
66
nkf
77
rexml
88
abbrev (0.1.2)
9-
activesupport (7.2.2.1)
10-
base64
11-
benchmark (>= 0.3)
12-
bigdecimal
13-
concurrent-ruby (~> 1.0, >= 1.3.1)
14-
connection_pool (>= 2.2.5)
15-
drb
16-
i18n (>= 1.6, < 2)
17-
logger (>= 1.4.2)
18-
minitest (>= 5.1)
19-
securerandom (>= 0.3)
20-
tzinfo (~> 2.0, >= 2.0.5)
219
addressable (2.8.7)
2210
public_suffix (>= 2.0.2, < 7.0)
23-
algoliasearch (1.27.5)
24-
httpclient (~> 2.8, >= 2.8.3)
25-
json (>= 1.5.1)
2611
artifactory (3.0.17)
2712
atomos (0.1.3)
2813
aws-eventstream (1.4.0)
@@ -45,62 +30,17 @@ GEM
4530
aws-eventstream (~> 1, >= 1.0.2)
4631
babosa (1.0.4)
4732
base64 (0.3.0)
48-
benchmark (0.4.0)
49-
bigdecimal (3.1.9)
5033
claide (1.1.0)
51-
cocoapods (1.16.2)
52-
addressable (~> 2.8)
53-
claide (>= 1.0.2, < 2.0)
54-
cocoapods-core (= 1.16.2)
55-
cocoapods-deintegrate (>= 1.0.3, < 2.0)
56-
cocoapods-downloader (>= 2.1, < 3.0)
57-
cocoapods-plugins (>= 1.0.0, < 2.0)
58-
cocoapods-search (>= 1.0.0, < 2.0)
59-
cocoapods-trunk (>= 1.6.0, < 2.0)
60-
cocoapods-try (>= 1.1.0, < 2.0)
61-
colored2 (~> 3.1)
62-
escape (~> 0.0.4)
63-
fourflusher (>= 2.3.0, < 3.0)
64-
gh_inspector (~> 1.0)
65-
molinillo (~> 0.8.0)
66-
nap (~> 1.0)
67-
ruby-macho (>= 2.3.0, < 3.0)
68-
xcodeproj (>= 1.27.0, < 2.0)
69-
cocoapods-core (1.16.2)
70-
activesupport (>= 5.0, < 8)
71-
addressable (~> 2.8)
72-
algoliasearch (~> 1.0)
73-
concurrent-ruby (~> 1.1)
74-
fuzzy_match (~> 2.0.4)
75-
nap (~> 1.0)
76-
netrc (~> 0.11)
77-
public_suffix (~> 4.0)
78-
typhoeus (~> 1.0)
79-
cocoapods-deintegrate (1.0.5)
80-
cocoapods-downloader (2.1)
81-
cocoapods-plugins (1.0.0)
82-
nap
83-
cocoapods-search (1.0.1)
84-
cocoapods-trunk (1.6.0)
85-
nap (>= 0.8, < 2.0)
86-
netrc (~> 0.11)
87-
cocoapods-try (1.2.0)
8834
colored (1.2)
8935
colored2 (3.1.2)
9036
commander (4.6.0)
9137
highline (~> 2.0.0)
92-
concurrent-ruby (1.3.5)
93-
connection_pool (2.5.0)
9438
declarative (0.0.20)
9539
digest-crc (0.7.0)
9640
rake (>= 12.0.0, < 14.0.0)
9741
domain_name (0.6.20240107)
9842
dotenv (2.8.1)
99-
drb (2.2.1)
10043
emoji_regex (3.2.3)
101-
escape (0.0.4)
102-
ethon (0.16.0)
103-
ffi (>= 1.15.0)
10444
excon (0.112.0)
10545
faraday (1.10.4)
10646
faraday-em_http (~> 1.0)
@@ -177,19 +117,6 @@ GEM
177117
fastlane-plugin-mattermost (1.3.2)
178118
fastlane-sirp (1.0.0)
179119
sysrandom (~> 1.0)
180-
ffi (1.17.1)
181-
ffi (1.17.1-aarch64-linux-gnu)
182-
ffi (1.17.1-aarch64-linux-musl)
183-
ffi (1.17.1-arm-linux-gnu)
184-
ffi (1.17.1-arm-linux-musl)
185-
ffi (1.17.1-arm64-darwin)
186-
ffi (1.17.1-x86-linux-gnu)
187-
ffi (1.17.1-x86-linux-musl)
188-
ffi (1.17.1-x86_64-darwin)
189-
ffi (1.17.1-x86_64-linux-gnu)
190-
ffi (1.17.1-x86_64-linux-musl)
191-
fourflusher (2.3.1)
192-
fuzzy_match (2.0.4)
193120
gh_inspector (1.1.3)
194121
google-apis-androidpublisher_v3 (0.54.0)
195122
google-apis-core (>= 0.11.0, < 2.a)
@@ -232,26 +159,20 @@ GEM
232159
domain_name (~> 0.5)
233160
httpclient (2.9.0)
234161
mutex_m
235-
i18n (1.14.7)
236-
concurrent-ruby (~> 1.0)
237162
jmespath (1.6.2)
238163
json (2.15.1)
239164
jwt (2.10.1)
240165
base64
241166
logger (1.7.0)
242167
mini_magick (4.13.2)
243168
mini_mime (1.1.5)
244-
minitest (5.25.5)
245-
molinillo (0.8.0)
246169
multi_json (1.15.0)
247170
multipart-post (2.4.1)
248171
mutex_m (0.3.0)
249172
nanaimo (0.4.0)
250-
nap (1.1.0)
251173
naturally (2.2.2)
252174
net-http (0.6.0)
253175
uri
254-
netrc (0.11.0)
255176
nkf (0.2.0)
256177
optparse (0.6.0)
257178
os (1.1.4)
@@ -265,10 +186,8 @@ GEM
265186
retriable (3.1.2)
266187
rexml (3.4.1)
267188
rouge (3.28.0)
268-
ruby-macho (2.5.1)
269189
ruby2_keywords (0.0.5)
270190
rubyzip (2.4.1)
271-
securerandom (0.4.1)
272191
security (0.1.5)
273192
signet (0.20.0)
274193
addressable (~> 2.8)
@@ -287,10 +206,6 @@ GEM
287206
tty-screen (0.8.2)
288207
tty-spinner (0.9.3)
289208
tty-cursor (~> 0.7)
290-
typhoeus (1.4.1)
291-
ethon (>= 0.9.0)
292-
tzinfo (2.0.6)
293-
concurrent-ruby (~> 1.0)
294209
uber (0.1.0)
295210
unicode-display_width (2.6.0)
296211
uri (1.0.4)
@@ -324,7 +239,6 @@ PLATFORMS
324239

325240
DEPENDENCIES
326241
abbrev (= 0.1.2)
327-
cocoapods (= 1.16.2)
328242
fastlane (= 2.228.0)
329243
fastlane-plugin-changelog (= 0.16.0)
330244
fastlane-plugin-mattermost (= 1.3.2)

0 commit comments

Comments
 (0)