Skip to content

Commit

Permalink
Merge branch 'release/ios/3.1.2-342'
Browse files Browse the repository at this point in the history
  • Loading branch information
pyby committed Sep 20, 2020
2 parents 026b1a8 + 06c2da8 commit b771c33
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ version: 7.0.1

name: Aiolos, nameSpecified: , owner: IdeasOnCanvas, version: 1.3.0

name: appcenter-sdk-apple, nameSpecified: , owner: microsoft, version: 3.3.3
name: appcenter-sdk-apple, nameSpecified: , owner: microsoft, version: 3.3.4

name: CoconutKit, nameSpecified: , owner: defagos, version: 3.4

Expand All @@ -440,37 +440,37 @@ name: DZNEmptyDataSet, nameSpecified: , owner: SRGSSR, version: v1.8.1_srg1

name: FXReachability, nameSpecified: , owner: SRGSSR, version: 1.3.2_srg4

name: ios-library, nameSpecified: , owner: urbanairship, version: 13.5.4
name: ios-library, nameSpecified: , owner: urbanairship, version: 13.5.6

name: libextobjc, nameSpecified: , owner: SRGSSR, version: 0.6_srg2

name: MAKVONotificationCenter, nameSpecified: , owner: SRGSSR, version: 1.0_srg4

name: Mantle, nameSpecified: , owner: Mantle, version: 2.1.1
name: Mantle, nameSpecified: , owner: Mantle, version: 2.1.2

name: Masonry, nameSpecified: , owner: SRGSSR, version: v1.1.0_srg1

name: srganalytics-apple, nameSpecified: , owner: SRGSSR, version: 4.2.1
name: srganalytics-apple, nameSpecified: , owner: SRGSSR, version: 4.2.2

name: srgappearance-apple, nameSpecified: , owner: SRGSSR, version: 2.1.0

name: srgcontentprotection-apple, nameSpecified: , owner: SRGSSR, version: 2.0.2

name: srgdataprovider-apple, nameSpecified: , owner: SRGSSR, version: 8.0.0
name: srgdataprovider-apple, nameSpecified: , owner: SRGSSR, version: 8.0.1

name: srgdiagnostics-apple, nameSpecified: , owner: SRGSSR, version: 2.0.1

name: srgidentity-apple, nameSpecified: , owner: SRGSSR, version: 2.0.3
name: srgidentity-apple, nameSpecified: , owner: SRGSSR, version: 2.0.4

name: srgletterbox-apple, nameSpecified: , owner: SRGSSR, version: 5.0.1
name: srgletterbox-apple, nameSpecified: , owner: SRGSSR, version: 5.0.2

name: srglogger-apple, nameSpecified: , owner: SRGSSR, version: 2.0.1

name: srgmediaplayer-apple, nameSpecified: , owner: SRGSSR, version: 5.0.2
name: srgmediaplayer-apple, nameSpecified: , owner: SRGSSR, version: 5.0.3

name: srgnetwork-apple, nameSpecified: , owner: SRGSSR, version: 2.0.2

name: srguserdata-apple, nameSpecified: , owner: SRGSSR, version: 2.0.3
name: srguserdata-apple, nameSpecified: , owner: SRGSSR, version: 2.0.4

name: tagcommander-apple, nameSpecified: , owner: SRGSSR, version: 4.5.4_4.4.1_srg3

Expand All @@ -480,4 +480,4 @@ name: YYWebImage, nameSpecified: , owner: SRGSSR, version: 1.0.5_srg2

add-version-numbers: true

LicensePlist Version: 1.8.3
LicensePlist Version: 2.16.0
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
<dict>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>Title</key>
<string>Licenses</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>File</key>
<string>com.mono0926.LicensePlist/Aiolos</string>
Expand All @@ -16,7 +22,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/appcenter-sdk-apple</string>
<key>Title</key>
<string>appcenter-sdk-apple (3.3.3)</string>
<string>appcenter-sdk-apple (3.3.4)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand Down Expand Up @@ -160,7 +166,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/ios-library</string>
<key>Title</key>
<string>ios-library (13.5.4)</string>
<string>ios-library (13.5.6)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand All @@ -184,7 +190,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/Mantle</string>
<key>Title</key>
<string>Mantle (2.1.1)</string>
<string>Mantle (2.1.2)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand Down Expand Up @@ -248,7 +254,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/srganalytics-apple</string>
<key>Title</key>
<string>srganalytics-apple (4.2.1)</string>
<string>srganalytics-apple (4.2.2)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand All @@ -272,7 +278,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/srgdataprovider-apple</string>
<key>Title</key>
<string>srgdataprovider-apple (8.0.0)</string>
<string>srgdataprovider-apple (8.0.1)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand All @@ -288,15 +294,15 @@
<key>File</key>
<string>com.mono0926.LicensePlist/srgidentity-apple</string>
<key>Title</key>
<string>srgidentity-apple (2.0.3)</string>
<string>srgidentity-apple (2.0.4)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
<dict>
<key>File</key>
<string>com.mono0926.LicensePlist/srgletterbox-apple</string>
<key>Title</key>
<string>srgletterbox-apple (5.0.1)</string>
<string>srgletterbox-apple (5.0.2)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand All @@ -312,7 +318,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/srgmediaplayer-apple</string>
<key>Title</key>
<string>srgmediaplayer-apple (5.0.2)</string>
<string>srgmediaplayer-apple (5.0.3)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand All @@ -328,7 +334,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/srguserdata-apple</string>
<key>Title</key>
<string>srguserdata-apple (2.0.3)</string>
<string>srguserdata-apple (2.0.4)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ github "microsoft/appcenter-sdk-apple" ~> 3.1.0
github "SRGSSR/DZNEmptyDataSet" "v1.8.1_srg1"
github "SRGSSR/Masonry" "v1.1.0_srg1"
github "urbanairship/ios-library" ~> 13.3.2
github "SRGSSR/srgletterbox-apple" "5.0.1"
github "SRGSSR/srguserdata-apple" "2.0.3"
github "SRGSSR/srgletterbox-apple" "5.0.2"
github "SRGSSR/srguserdata-apple" "2.0.4"
18 changes: 9 additions & 9 deletions Cartfile.resolved.proprietary
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Flipboard/FLEX" "4.1.1"
github "IdeasOnCanvas/Aiolos" "1.3.0"
github "Mantle/Mantle" "2.1.1"
github "Mantle/Mantle" "2.1.2"
github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.3.1"
github "SRGSSR/DZNEmptyDataSet" "v1.8.1_srg1"
github "SRGSSR/FXReachability" "1.3.2_srg4"
Expand All @@ -9,19 +9,19 @@ github "SRGSSR/Masonry" "v1.1.0_srg1"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
github "SRGSSR/YYWebImage" "1.0.5_srg2"
github "SRGSSR/libextobjc" "0.6_srg2"
github "SRGSSR/srganalytics-apple" "4.2.1"
github "SRGSSR/srganalytics-apple" "4.2.2"
github "SRGSSR/srgappearance-apple" "2.1.0"
github "SRGSSR/srgcontentprotection-apple" "2.0.2"
github "SRGSSR/srgdataprovider-apple" "8.0.0"
github "SRGSSR/srgdataprovider-apple" "8.0.1"
github "SRGSSR/srgdiagnostics-apple" "2.0.1"
github "SRGSSR/srgidentity-apple" "2.0.3"
github "SRGSSR/srgletterbox-apple" "5.0.1"
github "SRGSSR/srgidentity-apple" "2.0.4"
github "SRGSSR/srgletterbox-apple" "5.0.2"
github "SRGSSR/srglogger-apple" "2.0.1"
github "SRGSSR/srgmediaplayer-apple" "5.0.2"
github "SRGSSR/srgmediaplayer-apple" "5.0.3"
github "SRGSSR/srgnetwork-apple" "2.0.2"
github "SRGSSR/srguserdata-apple" "2.0.3"
github "SRGSSR/srguserdata-apple" "2.0.4"
github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3"
github "defagos/CoconutKit" "3.4"
github "mapbox/Fingertips" "cdffabac5506103a2c7cc5aedeed4021df2501da"
github "microsoft/appcenter-sdk-apple" "3.3.3"
github "urbanairship/ios-library" "13.5.4"
github "microsoft/appcenter-sdk-apple" "3.3.4"
github "urbanairship/ios-library" "13.5.6"
18 changes: 9 additions & 9 deletions Cartfile.resolved.public
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Flipboard/FLEX" "4.1.1"
github "IdeasOnCanvas/Aiolos" "1.3.0"
github "Mantle/Mantle" "2.1.1"
github "Mantle/Mantle" "2.1.2"
github "SRGSSR/ComScore-iOS-watchOS-tvOS" "6.3.1"
github "SRGSSR/DZNEmptyDataSet" "v1.8.1_srg1"
github "SRGSSR/FXReachability" "1.3.2_srg4"
Expand All @@ -9,19 +9,19 @@ github "SRGSSR/Masonry" "v1.1.0_srg1"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
github "SRGSSR/YYWebImage" "1.0.5_srg2"
github "SRGSSR/libextobjc" "0.6_srg2"
github "SRGSSR/srganalytics-apple" "4.2.1"
github "SRGSSR/srganalytics-apple" "4.2.2"
github "SRGSSR/srgappearance-apple" "2.1.0"
github "SRGSSR/srgcontentprotection-fake-apple" "2.0.2"
github "SRGSSR/srgdataprovider-apple" "8.0.0"
github "SRGSSR/srgdataprovider-apple" "8.0.1"
github "SRGSSR/srgdiagnostics-apple" "2.0.1"
github "SRGSSR/srgidentity-apple" "2.0.3"
github "SRGSSR/srgletterbox-apple" "5.0.1"
github "SRGSSR/srgidentity-apple" "2.0.4"
github "SRGSSR/srgletterbox-apple" "5.0.2"
github "SRGSSR/srglogger-apple" "2.0.1"
github "SRGSSR/srgmediaplayer-apple" "5.0.2"
github "SRGSSR/srgmediaplayer-apple" "5.0.3"
github "SRGSSR/srgnetwork-apple" "2.0.2"
github "SRGSSR/srguserdata-apple" "2.0.3"
github "SRGSSR/srguserdata-apple" "2.0.4"
github "SRGSSR/tagcommander-apple" "4.5.4_4.4.1_srg3"
github "defagos/CoconutKit" "3.4"
github "mapbox/Fingertips" "cdffabac5506103a2c7cc5aedeed4021df2501da"
github "microsoft/appcenter-sdk-apple" "3.3.3"
github "urbanairship/ios-library" "13.5.4"
github "microsoft/appcenter-sdk-apple" "3.3.4"
github "urbanairship/ios-library" "13.5.6"
30 changes: 15 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.345.0)
aws-sdk-core (3.104.3)
aws-partitions (1.373.0)
aws-sdk-core (3.107.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.36.0)
aws-sdk-kms (1.38.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.75.0)
aws-sdk-core (~> 3, >= 3.104.1)
aws-sdk-s3 (1.81.0)
aws-sdk-core (~> 3, >= 3.104.3)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.1)
aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
Expand All @@ -38,13 +38,13 @@ GEM
excon (0.76.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.2.0)
fastlane (2.153.1)
fastlane (2.160.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
Expand Down Expand Up @@ -96,14 +96,14 @@ GEM
google-cloud-env (1.3.3)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.26.2)
google-cloud-storage (1.28.0)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.13.0)
googleauth (0.13.1)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand All @@ -116,17 +116,17 @@ GEM
httpclient (2.8.3)
jmespath (1.4.0)
json (2.3.1)
jwt (2.2.1)
jwt (2.2.2)
memoist (0.16.2)
mini_magick (4.10.1)
mini_mime (1.0.2)
multi_json (1.15.0)
multipart-post (2.0.0)
nanaimo (0.3.0)
naturally (2.2.0)
os (1.1.0)
os (1.1.1)
plist (3.5.0)
public_suffix (4.0.5)
public_suffix (4.0.6)
rake (13.0.1)
representable (3.0.4)
declarative (< 0.1.0)
Expand Down Expand Up @@ -161,7 +161,7 @@ GEM
xcode-install (2.6.6)
claide (>= 0.9.1, < 1.1.0)
fastlane (>= 2.1.0, < 3.0.0)
xcodeproj (1.17.1)
xcodeproj (1.18.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
16 changes: 8 additions & 8 deletions PlaySRG.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7471,7 +7471,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 341;
CURRENT_PROJECT_VERSION = 342;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
Expand All @@ -7490,7 +7490,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 3.1.1;
MARKETING_VERSION = 3.1.2;
MARKETING_VERSION_SUFFIX = "-debug";
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -7539,7 +7539,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 341;
CURRENT_PROJECT_VERSION = 342;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -7552,7 +7552,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 3.1.1;
MARKETING_VERSION = 3.1.2;
MARKETING_VERSION_SUFFIX = "";
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -7884,7 +7884,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 341;
CURRENT_PROJECT_VERSION = 342;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -7898,7 +7898,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 3.1.1;
MARKETING_VERSION = 3.1.2;
MARKETING_VERSION_SUFFIX = "-beta";
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -8091,7 +8091,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 341;
CURRENT_PROJECT_VERSION = 342;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -8105,7 +8105,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 3.1.1;
MARKETING_VERSION = 3.1.2;
MARKETING_VERSION_SUFFIX = "-nightly";
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
Expand Down
Loading

0 comments on commit b771c33

Please sign in to comment.