Skip to content

Commit eece6b2

Browse files
author
github-actions
committed
Merge remote-tracking branch 'origin/main' into develop
2 parents d562340 + bb7463b commit eece6b2

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

gradle/app.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
minSdk = '24'
33
targetSdk = '34'
44
compileSdk = '34'
5-
versionName = '1.73'
6-
versionCode = '567'
5+
versionName = '1.74'
6+
versionCode = '570'

iosHyperskillApp/NotificationServiceExtension/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<key>CFBundleIdentifier</key>
1010
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleVersion</key>
12-
<string>594</string>
12+
<string>597</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>1.73</string>
14+
<string>1.74</string>
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleExecutable</key>

iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -5821,7 +5821,7 @@
58215821
buildSettings = {
58225822
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
58235823
CODE_SIGN_STYLE = Automatic;
5824-
CURRENT_PROJECT_VERSION = 594;
5824+
CURRENT_PROJECT_VERSION = 597;
58255825
DEBUG_INFORMATION_FORMAT = dwarf;
58265826
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58275827
GENERATE_INFOPLIST_FILE = NO;
@@ -5842,7 +5842,7 @@
58425842
buildSettings = {
58435843
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
58445844
CODE_SIGN_STYLE = Automatic;
5845-
CURRENT_PROJECT_VERSION = 594;
5845+
CURRENT_PROJECT_VERSION = 597;
58465846
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58475847
GENERATE_INFOPLIST_FILE = NO;
58485848
INFOPLIST_FILE = iosHyperskillAppUITests/Info.plist;
@@ -5863,7 +5863,7 @@
58635863
BUNDLE_LOADER = "$(TEST_HOST)";
58645864
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
58655865
CODE_SIGN_STYLE = Automatic;
5866-
CURRENT_PROJECT_VERSION = 594;
5866+
CURRENT_PROJECT_VERSION = 597;
58675867
DEBUG_INFORMATION_FORMAT = dwarf;
58685868
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58695869
INFOPLIST_FILE = iosHyperskillAppTests/Info.plist;
@@ -5884,7 +5884,7 @@
58845884
BUNDLE_LOADER = "$(TEST_HOST)";
58855885
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
58865886
CODE_SIGN_STYLE = Automatic;
5887-
CURRENT_PROJECT_VERSION = 594;
5887+
CURRENT_PROJECT_VERSION = 597;
58885888
DEVELOPMENT_TEAM = UJ4KC2QN7B;
58895889
INFOPLIST_FILE = iosHyperskillAppTests/Info.plist;
58905890
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -5905,7 +5905,7 @@
59055905
CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/NotificationServiceExtension.entitlements;
59065906
CODE_SIGN_IDENTITY = "Apple Development";
59075907
CODE_SIGN_STYLE = Automatic;
5908-
CURRENT_PROJECT_VERSION = 594;
5908+
CURRENT_PROJECT_VERSION = 597;
59095909
DEBUG_INFORMATION_FORMAT = dwarf;
59105910
DEVELOPMENT_TEAM = UJ4KC2QN7B;
59115911
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
@@ -5934,7 +5934,7 @@
59345934
CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/NotificationServiceExtension.entitlements;
59355935
CODE_SIGN_IDENTITY = "Apple Development";
59365936
CODE_SIGN_STYLE = Automatic;
5937-
CURRENT_PROJECT_VERSION = 594;
5937+
CURRENT_PROJECT_VERSION = 597;
59385938
DEVELOPMENT_TEAM = UJ4KC2QN7B;
59395939
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
59405940
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -6080,7 +6080,7 @@
60806080
CODE_SIGN_ENTITLEMENTS = iosHyperskillApp/iosHyperskillApp.entitlements;
60816081
CODE_SIGN_IDENTITY = "iPhone Developer";
60826082
CODE_SIGN_STYLE = Automatic;
6083-
CURRENT_PROJECT_VERSION = 594;
6083+
CURRENT_PROJECT_VERSION = 597;
60846084
DEVELOPMENT_ASSET_PATHS = "\"iosHyperskillApp/Preview Content\"";
60856085
DEVELOPMENT_TEAM = UJ4KC2QN7B;
60866086
ENABLE_PREVIEWS = YES;
@@ -6116,7 +6116,7 @@
61166116
CODE_SIGN_ENTITLEMENTS = iosHyperskillApp/iosHyperskillApp.entitlements;
61176117
CODE_SIGN_IDENTITY = "iPhone Developer";
61186118
CODE_SIGN_STYLE = Automatic;
6119-
CURRENT_PROJECT_VERSION = 594;
6119+
CURRENT_PROJECT_VERSION = 597;
61206120
DEVELOPMENT_ASSET_PATHS = "\"iosHyperskillApp/Preview Content\"";
61216121
DEVELOPMENT_TEAM = UJ4KC2QN7B;
61226122
ENABLE_PREVIEWS = YES;

iosHyperskillApp/iosHyperskillApp/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.73</string>
24+
<string>1.74</string>
2525
<key>CFBundleURLTypes</key>
2626
<array>
2727
<dict>
@@ -34,7 +34,7 @@
3434
</dict>
3535
</array>
3636
<key>CFBundleVersion</key>
37-
<string>594</string>
37+
<string>597</string>
3838
<key>FirebaseAppDelegateProxyEnabled</key>
3939
<false/>
4040
<key>FirebaseMessagingAutoInitEnabled</key>

iosHyperskillApp/iosHyperskillAppTests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<key>CFBundlePackageType</key>
1414
<string>BNDL</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.73</string>
16+
<string>1.74</string>
1717
<key>CFBundleVersion</key>
18-
<string>594</string>
18+
<string>597</string>
1919
</dict>
2020
</plist>

iosHyperskillApp/iosHyperskillAppUITests/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<key>CFBundlePackageType</key>
1414
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.73</string>
16+
<string>1.74</string>
1717
<key>CFBundleVersion</key>
18-
<string>594</string>
18+
<string>597</string>
1919
</dict>
2020
</plist>

0 commit comments

Comments
 (0)