Skip to content

Commit a0e3696

Browse files
authored
Merge pull request #1175 from StepicOrg/release/1.219.1
Release 1.219.1
2 parents 7dede3e + 831d824 commit a0e3696

29 files changed

+358
-271
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ updates:
2828
- "dependencies"
2929
- "ci/cd"
3030
rebase-strategy: "disabled"
31-
target-branch: "dev"
31+
target-branch: "dev"

.github/labeler.yml

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
11
a/b:
2-
- Stepic/Legacy/Analytics/SplitTests/*
3-
- Stepic/Legacy/Analytics/SplitTests/**/*
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
[
5+
"Stepic/Legacy/Analytics/SplitTests/*",
6+
"Stepic/Legacy/Analytics/SplitTests/**/*",
7+
]
48

59
dependencies:
6-
- Gemfile
7-
- Gemfile.lock
8-
- Podfile
9-
- Podfile.lock
10+
- changed-files:
11+
- any-glob-to-any-file:
12+
["Gemfile", "Gemfile.lock", "Podfile", "Podfile.lock"]
13+
14+
ci/cd:
15+
- changed-files:
16+
- any-glob-to-any-file:
17+
[
18+
".github/workflows/**",
19+
".github/actions/**",
20+
".github/dependabot.yml",
21+
".github/filters.yaml",
22+
".github/labeler.yml",
23+
]
1024

1125
main:
12-
- Stepic/*
13-
- Stepic/**/*
26+
- changed-files:
27+
- any-glob-to-any-file: ["Stepic/*", "Stepic/**/*"]
28+
29+
release:
30+
- base-branch: "master"

.github/workflows/label.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
permissions:
88
pull-requests: write
99
steps:
10-
- uses: actions/labeler@v4.3.0
10+
- uses: actions/labeler@v5
1111
with:
12-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
12+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
source "https://rubygems.org"
22
ruby "3.2.1"
33

4-
gem "fastlane", "2.214.0"
5-
gem "cocoapods", "1.12.1"
6-
gem "generamba", "1.5.0"
4+
gem "fastlane", "2.220.0"
5+
gem "cocoapods", "1.16.0"
6+
gem "generamba", git: "https://github.com/ivan-magda/Generamba.git", branch: "develop"
77

8-
eval_gemfile("fastlane/Pluginfile")
8+
eval_gemfile("fastlane/Pluginfile")

Gemfile.lock

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
GIT
2+
remote: https://github.com/ivan-magda/Generamba.git
3+
revision: a58a005e128e8270ec25f782fcb1c6c2449e0556
4+
branch: develop
5+
specs:
6+
generamba (1.6.0)
7+
cocoapods-core (>= 1.4.0, < 2.0.0)
8+
git (= 1.13.0)
9+
liquid (= 4.0.4)
10+
terminal-table (~> 3)
11+
thor (= 0.19.1)
12+
xcodeproj (>= 1.6.0, < 2.0.0)
13+
114
GEM
215
remote: https://rubygems.org/
316
specs:
@@ -43,12 +56,12 @@ GEM
4356
base64 (0.2.0)
4457
bigdecimal (3.1.8)
4558
claide (1.1.0)
46-
cocoapods (1.12.1)
59+
cocoapods (1.16.0)
4760
addressable (~> 2.8)
4861
claide (>= 1.0.2, < 2.0)
49-
cocoapods-core (= 1.12.1)
62+
cocoapods-core (= 1.16.0)
5063
cocoapods-deintegrate (>= 1.0.3, < 2.0)
51-
cocoapods-downloader (>= 1.6.0, < 2.0)
64+
cocoapods-downloader (>= 2.1, < 3.0)
5265
cocoapods-plugins (>= 1.0.0, < 2.0)
5366
cocoapods-search (>= 1.0.0, < 2.0)
5467
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -60,8 +73,8 @@ GEM
6073
molinillo (~> 0.8.0)
6174
nap (~> 1.0)
6275
ruby-macho (>= 2.3.0, < 3.0)
63-
xcodeproj (>= 1.21.0, < 2.0)
64-
cocoapods-core (1.12.1)
76+
xcodeproj (>= 1.26.0, < 2.0)
77+
cocoapods-core (1.16.0)
6578
activesupport (>= 5.0, < 8)
6679
addressable (~> 2.8)
6780
algoliasearch (~> 1.0)
@@ -72,7 +85,7 @@ GEM
7285
public_suffix (~> 4.0)
7386
typhoeus (~> 1.0)
7487
cocoapods-deintegrate (1.0.5)
75-
cocoapods-downloader (1.6.3)
88+
cocoapods-downloader (2.1)
7689
cocoapods-plugins (1.0.0)
7790
nap
7891
cocoapods-search (1.0.1)
@@ -126,14 +139,14 @@ GEM
126139
faraday_middleware (1.2.1)
127140
faraday (~> 1.0)
128141
fastimage (2.3.1)
129-
fastlane (2.214.0)
142+
fastlane (2.220.0)
130143
CFPropertyList (>= 2.3, < 4.0.0)
131144
addressable (>= 2.8, < 3.0.0)
132145
artifactory (~> 3.0)
133146
aws-sdk-s3 (~> 1.0)
134147
babosa (>= 1.0.3, < 2.0.0)
135148
bundler (>= 1.12.0, < 3.0.0)
136-
colored
149+
colored (~> 1.2)
137150
commander (~> 4.6)
138151
dotenv (>= 2.1.1, < 3.0.0)
139152
emoji_regex (>= 0.1, < 4.0)
@@ -145,79 +158,75 @@ GEM
145158
gh_inspector (>= 1.1.2, < 2.0.0)
146159
google-apis-androidpublisher_v3 (~> 0.3)
147160
google-apis-playcustomapp_v1 (~> 0.1)
161+
google-cloud-env (>= 1.6.0, < 2.0.0)
148162
google-cloud-storage (~> 1.31)
149163
highline (~> 2.0)
164+
http-cookie (~> 1.0.5)
150165
json (< 3.0.0)
151166
jwt (>= 2.1.0, < 3)
152167
mini_magick (>= 4.9.4, < 5.0.0)
153168
multipart-post (>= 2.0.0, < 3.0.0)
154169
naturally (~> 2.2)
155-
optparse (~> 0.1.1)
170+
optparse (>= 0.1.1, < 1.0.0)
156171
plist (>= 3.1.0, < 4.0.0)
157172
rubyzip (>= 2.0.0, < 3.0.0)
158-
security (= 0.1.3)
173+
security (= 0.1.5)
159174
simctl (~> 1.6.3)
160175
terminal-notifier (>= 2.0.0, < 3.0.0)
161-
terminal-table (>= 1.4.5, < 2.0.0)
176+
terminal-table (~> 3)
162177
tty-screen (>= 0.6.3, < 1.0.0)
163178
tty-spinner (>= 0.8.0, < 1.0.0)
164179
word_wrap (~> 1.0.0)
165180
xcodeproj (>= 1.13.0, < 2.0.0)
166181
xcpretty (~> 0.3.0)
167-
xcpretty-travis-formatter (>= 0.0.3)
182+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
168183
fastlane-plugin-firebase_app_distribution (0.9.1)
169184
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
170185
google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
171-
ffi (1.17.0)
186+
ffi (1.17.0-arm64-darwin)
172187
fourflusher (2.3.1)
173188
fuzzy_match (2.0.4)
174-
generamba (1.5.0)
175-
cocoapods-core (>= 1.4.0, < 2.0.0)
176-
git (= 1.2.9.1)
177-
liquid (= 4.0.0)
178-
terminal-table (= 1.4.5)
179-
thor (= 0.19.1)
180-
xcodeproj (>= 1.5.0, < 2.0.0)
181189
gh_inspector (1.1.3)
182-
git (1.2.9.1)
183-
google-apis-androidpublisher_v3 (0.74.0)
184-
google-apis-core (>= 0.15.0, < 2.a)
185-
google-apis-core (0.15.1)
190+
git (1.13.0)
191+
addressable (~> 2.8)
192+
rchardet (~> 1.8)
193+
google-apis-androidpublisher_v3 (0.54.0)
194+
google-apis-core (>= 0.11.0, < 2.a)
195+
google-apis-core (0.11.3)
186196
addressable (~> 2.5, >= 2.5.1)
187197
googleauth (~> 1.9)
188198
httpclient (>= 2.8.3, < 3.a)
189199
mini_mime (~> 1.0)
190200
mutex_m
191201
representable (~> 3.0)
192202
retriable (>= 2.0, < 4.a)
203+
rexml
193204
google-apis-firebaseappdistribution_v1 (0.3.0)
194205
google-apis-core (>= 0.11.0, < 2.a)
195206
google-apis-firebaseappdistribution_v1alpha (0.2.0)
196207
google-apis-core (>= 0.11.0, < 2.a)
197-
google-apis-iamcredentials_v1 (0.21.0)
198-
google-apis-core (>= 0.15.0, < 2.a)
199-
google-apis-playcustomapp_v1 (0.16.0)
200-
google-apis-core (>= 0.15.0, < 2.a)
201-
google-apis-storage_v1 (0.47.0)
202-
google-apis-core (>= 0.15.0, < 2.a)
208+
google-apis-iamcredentials_v1 (0.17.0)
209+
google-apis-core (>= 0.11.0, < 2.a)
210+
google-apis-playcustomapp_v1 (0.13.0)
211+
google-apis-core (>= 0.11.0, < 2.a)
212+
google-apis-storage_v1 (0.31.0)
213+
google-apis-core (>= 0.11.0, < 2.a)
203214
google-cloud-core (1.7.1)
204215
google-cloud-env (>= 1.0, < 3.a)
205216
google-cloud-errors (~> 1.0)
206-
google-cloud-env (2.2.1)
207-
faraday (>= 1.0, < 3.a)
217+
google-cloud-env (1.6.0)
218+
faraday (>= 0.17.3, < 3.0)
208219
google-cloud-errors (1.4.0)
209-
google-cloud-storage (1.52.0)
220+
google-cloud-storage (1.47.0)
210221
addressable (~> 2.8)
211222
digest-crc (~> 0.4)
212-
google-apis-core (~> 0.13)
213-
google-apis-iamcredentials_v1 (~> 0.18)
214-
google-apis-storage_v1 (~> 0.38)
223+
google-apis-iamcredentials_v1 (~> 0.1)
224+
google-apis-storage_v1 (~> 0.31.0)
215225
google-cloud-core (~> 1.6)
216226
googleauth (~> 1.9)
217227
mini_mime (~> 1.0)
218-
googleauth (1.11.2)
219-
faraday (>= 1.0, < 3.a)
220-
google-cloud-env (~> 2.1)
228+
googleauth (1.8.1)
229+
faraday (>= 0.17.3, < 3.a)
221230
jwt (>= 1.4, < 3.0)
222231
multi_json (~> 1.11)
223232
os (>= 0.9, < 2.0)
@@ -232,25 +241,25 @@ GEM
232241
json (2.7.4)
233242
jwt (2.9.3)
234243
base64
235-
liquid (4.0.0)
244+
liquid (4.0.4)
236245
logger (1.6.1)
237246
mini_magick (4.13.2)
238247
mini_mime (1.1.5)
239248
minitest (5.25.1)
240249
molinillo (0.8.0)
241250
multi_json (1.15.0)
242251
multipart-post (2.4.1)
243-
mutex_m (0.2.0)
244252
nanaimo (0.4.0)
245253
nap (1.1.0)
246254
naturally (2.2.1)
247255
netrc (0.11.0)
248256
nkf (0.2.0)
249-
optparse (0.1.1)
257+
optparse (0.5.0)
250258
os (1.1.4)
251259
plist (3.7.1)
252260
public_suffix (4.0.7)
253261
rake (13.2.1)
262+
rchardet (1.8.0)
254263
representable (3.2.0)
255264
declarative (< 0.1.0)
256265
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -262,7 +271,7 @@ GEM
262271
ruby2_keywords (0.0.5)
263272
rubyzip (2.3.2)
264273
securerandom (0.3.1)
265-
security (0.1.3)
274+
security (0.1.5)
266275
signet (0.19.0)
267276
addressable (~> 2.8)
268277
faraday (>= 0.17.5, < 3.a)
@@ -272,7 +281,8 @@ GEM
272281
CFPropertyList
273282
naturally
274283
terminal-notifier (2.0.0)
275-
terminal-table (1.4.5)
284+
terminal-table (3.0.2)
285+
unicode-display_width (>= 1.1.1, < 3)
276286
thor (0.19.1)
277287
trailblazer-option (0.1.2)
278288
tty-cursor (0.7.1)
@@ -284,6 +294,7 @@ GEM
284294
tzinfo (2.0.6)
285295
concurrent-ruby (~> 1.0)
286296
uber (0.1.0)
297+
unicode-display_width (2.6.0)
287298
word_wrap (1.0.0)
288299
xcodeproj (1.26.0)
289300
CFPropertyList (>= 2.3.3, < 4.0)
@@ -298,13 +309,13 @@ GEM
298309
xcpretty (~> 0.2, >= 0.0.7)
299310

300311
PLATFORMS
301-
ruby
312+
arm64-darwin-22
302313

303314
DEPENDENCIES
304-
cocoapods (= 1.12.1)
305-
fastlane (= 2.214.0)
315+
cocoapods (= 1.16.0)
316+
fastlane (= 2.220.0)
306317
fastlane-plugin-firebase_app_distribution
307-
generamba (= 1.5.0)
318+
generamba!
308319

309320
RUBY VERSION
310321
ruby 3.2.1p31

Podfile

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ def all_pods
4545
pod "SnapKit", "5.0.1"
4646

4747
# Firebase
48-
pod "Firebase/Core", "8.9.1"
49-
pod "Firebase/Messaging", "8.9.1"
50-
pod "Firebase/Analytics", "8.9.1"
51-
pod "Firebase/Crashlytics", "8.9.1"
52-
pod "Firebase/RemoteConfig", "8.9.1"
48+
pod "Firebase/Core", "10.15.0"
49+
pod "Firebase/Messaging", "10.15.0"
50+
pod "Firebase/Analytics", "10.15.0"
51+
pod "Firebase/Crashlytics", "10.15.0"
52+
pod "Firebase/RemoteConfig", "10.15.0"
5353

5454
pod "YandexMobileMetrica/Dynamic", "3.17.0"
5555
pod "Amplitude", "8.5.0"
@@ -102,6 +102,22 @@ target "Stepic" do
102102
end
103103

104104
post_install do |installer|
105+
# Fix Xcode 15 Error 'DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead'
106+
installer.aggregate_targets.each do |target|
107+
target.xcconfigs.each do |variant, xcconfig|
108+
xcconfig_path = target.client_root + target.xcconfig_relative_path(variant)
109+
IO.write(xcconfig_path, IO.read(xcconfig_path).gsub("DT_TOOLCHAIN_DIR", "TOOLCHAIN_DIR"))
110+
end
111+
end
112+
installer.pods_project.targets.each do |target|
113+
target.build_configurations.each do |config|
114+
if config.base_configuration_reference.is_a? Xcodeproj::Project::Object::PBXFileReference
115+
xcconfig_path = config.base_configuration_reference.real_path
116+
IO.write(xcconfig_path, IO.read(xcconfig_path).gsub("DT_TOOLCHAIN_DIR", "TOOLCHAIN_DIR"))
117+
end
118+
end
119+
end
120+
105121
installer.pods_project.targets.each do |target|
106122
target.build_configurations.each do |config|
107123
if config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"].to_f < 12.0

0 commit comments

Comments
 (0)