Skip to content

Commit c4d89c6

Browse files
committed
Fix fastlane
gem 'concurrent-ruby', '1.3.4'
1 parent 72b4f5b commit c4d89c6

File tree

6 files changed

+34
-26
lines changed

6 files changed

+34
-26
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ source "https://rubygems.org"
33
gem "fastlane"
44
gem 'cocoapods', '~> 1.16.2'
55
gem 'xcodeproj', '~> 1.27.0'
6+
gem 'concurrent-ruby', '1.3.4'
67

78
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
89
eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,12 @@ GEM
8787
colored2 (3.1.2)
8888
commander (4.6.0)
8989
highline (~> 2.0.0)
90+
<<<<<<< Updated upstream
9091
concurrent-ruby (1.3.5)
9192
connection_pool (2.5.0)
93+
=======
94+
concurrent-ruby (1.3.4)
95+
>>>>>>> Stashed changes
9296
declarative (0.0.20)
9397
digest-crc (0.7.0)
9498
rake (>= 12.0.0, < 14.0.0)
@@ -304,6 +308,7 @@ PLATFORMS
304308

305309
DEPENDENCIES
306310
cocoapods (~> 1.16.2)
311+
concurrent-ruby (= 1.3.4)
307312
fastlane
308313
fastlane-plugin-firebase_app_distribution
309314
xcodeproj (~> 1.27.0)

Permanent.xcodeproj/project.pbxproj

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4655,14 +4655,10 @@
46554655
inputFileListPaths = (
46564656
"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-resources-${CONFIGURATION}-input-files.xcfilelist",
46574657
);
4658-
inputPaths = (
4659-
);
46604658
name = "[CP] Copy Pods Resources";
46614659
outputFileListPaths = (
46624660
"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-resources-${CONFIGURATION}-output-files.xcfilelist",
46634661
);
4664-
outputPaths = (
4665-
);
46664662
runOnlyForDeploymentPostprocessing = 0;
46674663
shellPath = /bin/sh;
46684664
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-resources.sh\"\n";
@@ -4676,14 +4672,10 @@
46764672
inputFileListPaths = (
46774673
"${PODS_ROOT}/Target Support Files/Pods-PermanentTests/Pods-PermanentTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
46784674
);
4679-
inputPaths = (
4680-
);
46814675
name = "[CP] Embed Pods Frameworks";
46824676
outputFileListPaths = (
46834677
"${PODS_ROOT}/Target Support Files/Pods-PermanentTests/Pods-PermanentTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
46844678
);
4685-
outputPaths = (
4686-
);
46874679
runOnlyForDeploymentPostprocessing = 0;
46884680
shellPath = /bin/sh;
46894681
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PermanentTests/Pods-PermanentTests-frameworks.sh\"\n";
@@ -4741,14 +4733,10 @@
47414733
inputFileListPaths = (
47424734
"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-frameworks-${CONFIGURATION}-input-files.xcfilelist",
47434735
);
4744-
inputPaths = (
4745-
);
47464736
name = "[CP] Embed Pods Frameworks";
47474737
outputFileListPaths = (
47484738
"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-frameworks-${CONFIGURATION}-output-files.xcfilelist",
47494739
);
4750-
outputPaths = (
4751-
);
47524740
runOnlyForDeploymentPostprocessing = 0;
47534741
shellPath = /bin/sh;
47544742
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-frameworks.sh\"\n";

Podfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ PODS:
1717
- Firebase/RemoteConfig (11.1.0):
1818
- Firebase/CoreOnly
1919
- FirebaseRemoteConfig (~> 11.1.0)
20-
- FirebaseABTesting (11.4.0):
20+
- FirebaseABTesting (11.3.0):
2121
- FirebaseCore (~> 11.0)
2222
- FirebaseAnalytics (11.1.0):
2323
- FirebaseAnalytics/AdIdSupport (= 11.1.0)
@@ -41,9 +41,9 @@ PODS:
4141
- FirebaseCoreInternal (~> 11.0)
4242
- GoogleUtilities/Environment (~> 8.0)
4343
- GoogleUtilities/Logger (~> 8.0)
44-
- FirebaseCoreExtension (11.4.1):
44+
- FirebaseCoreExtension (11.3.0):
4545
- FirebaseCore (~> 11.0)
46-
- FirebaseCoreInternal (11.10.0):
46+
- FirebaseCoreInternal (11.3.0):
4747
- "GoogleUtilities/NSData+zlib (~> 8.0)"
4848
- FirebaseCrashlytics (11.1.0):
4949
- FirebaseCore (~> 11.0)
@@ -54,7 +54,7 @@ PODS:
5454
- GoogleUtilities/Environment (~> 8.0)
5555
- nanopb (~> 3.30910.0)
5656
- PromisesObjC (~> 2.4)
57-
- FirebaseInstallations (11.4.0):
57+
- FirebaseInstallations (11.3.0):
5858
- FirebaseCore (~> 11.0)
5959
- GoogleUtilities/Environment (~> 8.0)
6060
- GoogleUtilities/UserDefaults (~> 8.0)
@@ -76,7 +76,7 @@ PODS:
7676
- FirebaseSharedSwift (~> 11.0)
7777
- GoogleUtilities/Environment (~> 8.0)
7878
- "GoogleUtilities/NSData+zlib (~> 8.0)"
79-
- FirebaseRemoteConfigInterop (11.10.0)
79+
- FirebaseRemoteConfigInterop (11.3.0)
8080
- FirebaseSessions (11.3.0):
8181
- FirebaseCore (~> 11.0)
8282
- FirebaseCoreExtension (~> 11.0)
@@ -86,7 +86,7 @@ PODS:
8686
- GoogleUtilities/UserDefaults (~> 8.0)
8787
- nanopb (~> 3.30910.0)
8888
- PromisesSwift (~> 2.1)
89-
- FirebaseSharedSwift (11.10.0)
89+
- FirebaseSharedSwift (11.3.0)
9090
- GoogleAppMeasurement (11.1.0):
9191
- GoogleAppMeasurement/AdIdSupport (= 11.1.0)
9292
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -222,18 +222,18 @@ SPEC REPOS:
222222

223223
SPEC CHECKSUMS:
224224
Firebase: fdb3bd378401f26a7adfcf446b0a630f8c20c0e8
225-
FirebaseABTesting: aef1719704fade00b200827e7973f352efc4caee
225+
FirebaseABTesting: c4559fcd2eba9f6bdaf0599e2c37ded01c343e4c
226226
FirebaseAnalytics: 9fcdb2e9844174bb405b34cc47092c9b91993d83
227227
FirebaseCore: 6e2a2782e234b14d48e880ed369ac55cda87fed7
228-
FirebaseCoreExtension: f1bc67a4702931a7caa097d8e4ac0a1b0d16720e
229-
FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
228+
FirebaseCoreExtension: 30bb063476ef66cd46925243d64ad8b2c8ac3264
229+
FirebaseCoreInternal: ac26d09a70c730e497936430af4e60fb0c68ec4e
230230
FirebaseCrashlytics: 95cfe27373ff2edab39c28583d93cbf2dfff401d
231-
FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
231+
FirebaseInstallations: 58cf94dabf1e2bb2fa87725a9be5c2249171cda0
232232
FirebaseMessaging: 61014ecade746724664eee1f6c066c058a7c9fa7
233233
FirebaseRemoteConfig: 05521e937b72e01847a7128da5a492327364c705
234-
FirebaseRemoteConfigInterop: 7c9a9c65eff32cbb0f7bf8d18140612ad57dfcc6
234+
FirebaseRemoteConfigInterop: c3a5c31b3c22079f41ba1dc645df889d9ce38cb9
235235
FirebaseSessions: 655ff17f3cc1a635cbdc2d69b953878001f9e25b
236-
FirebaseSharedSwift: 1baacae75939499b5def867cbe34129464536a38
236+
FirebaseSharedSwift: d39c2ad64a11a8d936ce25a42b00df47078bb59c
237237
GoogleAppMeasurement: 8bb20efc67c8fc1cff9c42a06c256caf55289bbf
238238
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
239239
GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d

fastlane/Fastfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ platform :ios do
3232
reset_simulator: true)
3333
end
3434

35+
lane :cocopods do
36+
# resolve cocoapods
37+
cocoapods(use_bundle_exec: true,
38+
podfile: "./Podfile")
39+
end
40+
3541
lane :beta do
3642
setup_ci
3743

fastlane/README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
2323

2424
Description of what the lane does
2525

26+
### ios cocopods
27+
28+
```sh
29+
[bundle exec] fastlane ios cocopods
30+
```
31+
32+
33+
2634
### ios beta
2735

2836
```sh
@@ -39,10 +47,10 @@ Description of what the lane does
3947

4048

4149

42-
### ios manual
50+
### ios update_devices
4351

4452
```sh
45-
[bundle exec] fastlane ios manual
53+
[bundle exec] fastlane ios update_devices
4654
```
4755

4856

0 commit comments

Comments
 (0)