Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
pyby committed Jul 29, 2019
2 parents f8c299e + d9ca2ea commit b15d19e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "SRGSSR/libextobjc" "0.6_srg1"
github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
github "SRGSSR/srglogger-ios" "1.0.9"
github "SRGSSR/srglogger-ios" "1.1"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "SRGSSR/MAKVONotificationCenter" "1.0_srg3"
github "SRGSSR/libextobjc" "0.6_srg1"
github "SRGSSR/srglogger-ios" "1.0.9"
github "SRGSSR/srglogger-ios" "1.1"
2 changes: 1 addition & 1 deletion Framework/Sources/SRGPage.m
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ - (NSUInteger)hash

- (id)copyWithZone:(NSZone *)zone
{
return [[self.class allocWithZone:zone] initWithSize:self.size number:self.number URLRequest:self.URLRequest];
return [[self.class alloc] initWithSize:self.size number:self.number URLRequest:self.URLRequest];
}

#pragma mark Description
Expand Down
8 changes: 4 additions & 4 deletions SRGNetwork.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -677,7 +677,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -793,7 +793,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -899,7 +899,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down

0 comments on commit b15d19e

Please sign in to comment.