Skip to content

Commit

Permalink
Merge branch 'release/3.7.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@pyby
pyby committed Jun 13, 2019
2 parents 5007211 + 36e37bc commit 32a97d5
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "SRGSSR/ComScore-iOS-watchOS-tvOS" "5.8.4"
github "SRGSSR/srgdataprovider-ios" "6.5.1"
github "SRGSSR/srgidentity-ios" "1.0.1"
github "SRGSSR/srgdataprovider-ios" "6.5.2"
github "SRGSSR/srgidentity-ios" "1.0.2"
github "SRGSSR/srgmediaplayer-ios" "2.6"
github "SRGSSR/tagcommander-ios" "4.3.1_4.3.1"
github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
2 changes: 1 addition & 1 deletion Cartfile.private.proprietary
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgcontentprotection-ios" "1.2.1"
github "SRGSSR/srgcontentprotection-ios" "1.2.2"
2 changes: 1 addition & 1 deletion Cartfile.private.public
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SRGSSR/srgcontentprotection-fake-ios" "1.2.1"
github "SRGSSR/srgcontentprotection-fake-ios" "1.2.2"
10 changes: 5 additions & 5 deletions Cartfile.resolved.proprietary
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
github "SRGSSR/Masonry" "v1.1.0_srg1"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
github "SRGSSR/libextobjc" "0.6_srg1"
github "SRGSSR/srgcontentprotection-ios" "1.2.1"
github "SRGSSR/srgdataprovider-ios" "6.5.1"
github "SRGSSR/srgcontentprotection-ios" "1.2.2"
github "SRGSSR/srgdataprovider-ios" "6.5.2"
github "SRGSSR/srgdiagnostics-ios" "1.0.1"
github "SRGSSR/srgidentity-ios" "1.0.1"
github "SRGSSR/srgidentity-ios" "1.0.2"
github "SRGSSR/srglogger-ios" "1.0.9"
github "SRGSSR/srgmediaplayer-ios" "2.6"
github "SRGSSR/srgnetwork-ios" "1.0.1"
github "SRGSSR/tagcommander-ios" "4.3.1_4.3.1"
github "SRGSSR/srgnetwork-ios" "1.0.2"
github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
github "kif-framework/KIF" "v3.6.0"
github "rckoenes/OHHTTPStubs" "6.1.1"
10 changes: 5 additions & 5 deletions Cartfile.resolved.public
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
github "SRGSSR/Masonry" "v1.1.0_srg1"
github "SRGSSR/UICKeyChainStore" "v2.1.2_srg1"
github "SRGSSR/libextobjc" "0.6_srg1"
github "SRGSSR/srgcontentprotection-fake-ios" "1.2.1"
github "SRGSSR/srgdataprovider-ios" "6.5.1"
github "SRGSSR/srgcontentprotection-fake-ios" "1.2.2"
github "SRGSSR/srgdataprovider-ios" "6.5.2"
github "SRGSSR/srgdiagnostics-ios" "1.0.1"
github "SRGSSR/srgidentity-ios" "1.0.1"
github "SRGSSR/srgidentity-ios" "1.0.2"
github "SRGSSR/srglogger-ios" "1.0.9"
github "SRGSSR/srgmediaplayer-ios" "2.6"
github "SRGSSR/srgnetwork-ios" "1.0.1"
github "SRGSSR/tagcommander-ios" "4.3.1_4.3.1"
github "SRGSSR/srgnetwork-ios" "1.0.2"
github "SRGSSR/tagcommander-ios" "4.3.3_4.3.1"
github "kif-framework/KIF" "v3.6.0"
github "rckoenes/OHHTTPStubs" "6.1.1"
8 changes: 4 additions & 4 deletions SRGAnalytics.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1823,7 +1823,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 3.7;
MARKETING_VERSION = 3.7.1;
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGAnalytics;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2021,7 +2021,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 3.7;
MARKETING_VERSION = 3.7.1;
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGAnalytics;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2542,7 +2542,7 @@
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 3.7;
MARKETING_VERSION = 3.7.1;
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGAnalytics;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -2568,7 +2568,7 @@
INFOPLIST_FILE = Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 3.7;
MARKETING_VERSION = 3.7.1;
PRODUCT_BUNDLE_IDENTIFIER = ch.srgssr.SRGAnalytics;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down

0 comments on commit 32a97d5

Please sign in to comment.