Skip to content

Commit

Permalink
Merge branch 'release/mid-09-2023'
Browse files Browse the repository at this point in the history
  • Loading branch information
rts-devops committed Sep 18, 2023
2 parents a92512e + 0c8ec56 commit 4ad2b7b
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 37 deletions.
24 changes: 24 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
changelog:
exclude:
authors:
- rts-devops
labels:
- internal
categories:
- title: Improvements
labels:
- improvement
- title: Fixes
labels:
- bug
- title: Maintenances
labels:
- maintenance
- title: CI and dev tools
labels:
- CI
- 'dev tool'
- title: Other changes
labels:
- '*'
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ name: srgdiagnostics-apple, nameSpecified: SRGDiagnostics, owner: SRGSSR, versio

name: srgidentity-apple, nameSpecified: SRGIdentity, owner: SRGSSR, version: 3.3.0, source: https://github.com/SRGSSR/srgidentity-apple

name: srgletterbox-apple, nameSpecified: SRGLetterbox, owner: SRGSSR, version: 9.1.1, source: https://github.com/SRGSSR/srgletterbox-apple
name: srgletterbox-apple, nameSpecified: SRGLetterbox, owner: SRGSSR, version: 9.1.2, source: https://github.com/SRGSSR/srgletterbox-apple

name: srglogger-apple, nameSpecified: SRGLogger, owner: SRGSSR, version: 3.1.0, source: https://github.com/SRGSSR/srglogger-apple

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/srgletterbox-apple</string>
<key>Title</key>
<string>SRGLetterbox (9.1.1)</string>
<string>SRGLetterbox (9.1.2)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand Down
53 changes: 26 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ GEM
specs:
CFPropertyList (3.0.6)
rexml
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
ast (2.4.2)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.771.0)
aws-sdk-core (3.173.1)
aws-partitions (1.824.0)
aws-sdk-core (3.181.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.64.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (1.71.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.122.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-s3 (1.134.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.2)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
Expand All @@ -31,13 +31,13 @@ GEM
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.6.4)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.99.0)
excon (0.103.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -67,7 +67,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.7)
fastlane (2.213.0)
fastlane (2.215.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -88,6 +88,7 @@ GEM
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
Expand All @@ -99,19 +100,19 @@ GEM
security (= 0.1.3)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-appcenter (2.1.0)
fastlane-plugin-appcenter (2.1.1)
fastlane-plugin-xcconfig (2.0.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.42.0)
google-apis-androidpublisher_v3 (0.49.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.0)
google-apis-core (0.11.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand Down Expand Up @@ -140,10 +141,9 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.5.2)
googleauth (1.8.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
Expand All @@ -153,10 +153,9 @@ GEM
httpclient (2.8.3)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.0)
memoist (0.16.2)
jwt (2.7.1)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.3.0)
nanaimo (0.3.0)
Expand All @@ -167,7 +166,7 @@ GEM
parser (3.2.2.0)
ast (~> 2.4.1)
plist (3.7.0)
public_suffix (5.0.1)
public_suffix (5.0.3)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.7.0)
Expand All @@ -176,7 +175,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.5)
rexml (3.2.6)
rouge (2.0.7)
rubocop (1.42.0)
json (~> 2.3)
Expand All @@ -194,7 +193,7 @@ GEM
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.3)
signet (0.17.0)
signet (0.18.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
Expand All @@ -203,8 +202,8 @@ GEM
CFPropertyList
naturally
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.1)
Expand All @@ -214,7 +213,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
unicode-display_width (2.4.2)
webrick (1.8.1)
word_wrap (1.0.0)
xcodeproj (1.22.0)
Expand Down
2 changes: 1 addition & 1 deletion PlaySRG.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -19287,7 +19287,7 @@
repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 9.1.1;
minimumVersion = 9.1.2;
};
};
6F6DD3A924E449D7003F9437 /* XCRemoteSwiftPackageReference "srgdataprovider-apple" */ = {
Expand Down
4 changes: 2 additions & 2 deletions PlaySRG.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SRGSSR/srgletterbox-apple.git",
"state" : {
"revision" : "a4b3c5378efa4db01c70006f500e64522feb67ba",
"version" : "9.1.1"
"revision" : "52f33f390ee27e6c21b7a51282e787636dcdf663",
"version" : "9.1.2"
}
},
{
Expand Down
3 changes: 2 additions & 1 deletion WhatsNew-iOS-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,6 @@
"3.7.5-425": "Branch beta\n- Ask user consent at launch when needed.\n- Add privacy section in settings view.",
"3.7.5-426": "- Implementation of a consent banner for the personal data usage.",
"3.7.6-427": "Branch beta\n- Update SRGAnalytics with Tag Commander V5 update.\n- Page view analytics have page type property.",
"3.7.6-428": "- Update Chromecast component.\n- Maintenance release."
"3.7.6-428": "- Update Chromecast component.\n- Maintenance release.",
"3.7.7-429": "- Fix player minor issues on iOS 17."
}
2 changes: 1 addition & 1 deletion Xcode/Shared/Common.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PRODUCT_BUNDLE_IDENTIFIER = $(BU__BUNDLE_IDENTIFIER_PREFIX)$(BU__BUNDLE_IDENTIFI
PRODUCT_NAME = $(BU__PRODUCT_NAME)$(TARGET__PRODUCT_NAME_SUFFIX)

// Version information
CURRENT_PROJECT_VERSION = 428
CURRENT_PROJECT_VERSION = 429

GCC_PREPROCESSOR_DEFINITIONS[config=Beta] = BETA=1
GCC_PREPROCESSOR_DEFINITIONS[config=Beta_AppCenter] = BETA=1 APPCENTER=1
Expand Down
2 changes: 1 addition & 1 deletion Xcode/Shared/Targets/iOS/Common.xcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "Xcode/Shared/Common.xcconfig"

// Version information
MARKETING_VERSION = 3.7.6
MARKETING_VERSION = 3.7.7

SDKROOT = iphoneos
TARGETED_DEVICE_FAMILY=1,2
2 changes: 1 addition & 1 deletion Xcode/Shared/Targets/tvOS/Common.xcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "Xcode/Shared/Common.xcconfig"

// Version information
MARKETING_VERSION = 1.7.5
MARKETING_VERSION = 1.7.6

SDKROOT = appletvos
TARGETED_DEVICE_FAMILY=3
2 changes: 1 addition & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ platform :ios do

# Tag only platfoms which not have already a tag and have a what's new for beta.
git_pull(only_tags: true)
platforms = ['iOS', 'tvOS'].reject do |platform|
platforms = ['tvOS', 'iOS'].reject do |platform|
tag = srg_tag(platform)
tag_version = tag_version(platform)
git_tag_exists(tag:) || what_s_new_for_beta(platform, tag_version).empty?
Expand Down

0 comments on commit 4ad2b7b

Please sign in to comment.