From 68a906ea8a55b2d805572ba7dabd6b45d402f322 Mon Sep 17 00:00:00 2001 From: Damien Legrand Date: Sat, 31 Mar 2018 01:39:30 +0200 Subject: [PATCH 1/3] Fix Implicit retain of self within blocks warnings (#318) --- Bolts/iOS/BFAppLinkReturnToRefererController.m | 16 ++++++++-------- Vendor/xctoolchain | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bolts/iOS/BFAppLinkReturnToRefererController.m b/Bolts/iOS/BFAppLinkReturnToRefererController.m index d38063549..045a3e2d6 100644 --- a/Bolts/iOS/BFAppLinkReturnToRefererController.m +++ b/Bolts/iOS/BFAppLinkReturnToRefererController.m @@ -130,7 +130,7 @@ - (void)statusBarFrameWillChange:(NSNotification *)notification { if (CGRectGetHeight(newFrame) == 40) { UIViewAnimationOptions options = UIViewAnimationOptionBeginFromCurrentState; [UIView animateWithDuration:kBFViewAnimationDuration delay:0.0 options:options animations:^{ - _view.frame = CGRectMake(0.0, 0.0, CGRectGetWidth(_view.bounds), 0.0); + self->_view.frame = CGRectMake(0.0, 0.0, CGRectGetWidth(self->_view.bounds), 0.0); } completion:nil]; } } @@ -145,7 +145,7 @@ - (void)statusBarFrameDidChange:(NSNotification *)notification { if (CGRectGetHeight(newFrame) == 40) { UIViewAnimationOptions options = UIViewAnimationOptionBeginFromCurrentState; [UIView animateWithDuration:kBFViewAnimationDuration delay:0.0 options:options animations:^{ - [_view sizeToFit]; + [self->_view sizeToFit]; [self moveNavigationBar]; } completion:nil]; } @@ -186,13 +186,13 @@ - (void)closeViewAnimated:(BOOL)animated { - (void)closeViewAnimated:(BOOL)animated explicitlyClosed:(BOOL)explicitlyClosed { void (^closer)(void) = ^{ - if (_navigationController) { - [self updateNavigationBarY:_view.statusBarHeight]; + if (self->_navigationController) { + [self updateNavigationBarY:self->_view.statusBarHeight]; } - CGRect frame = _view.frame; + CGRect frame = self->_view.frame; frame.size.height = 0.0; - _view.frame = frame; + self->_view.frame = frame; }; if (animated) { @@ -200,13 +200,13 @@ - (void)closeViewAnimated:(BOOL)animated explicitlyClosed:(BOOL)explicitlyClosed closer(); } completion:^(BOOL finished) { if (explicitlyClosed) { - _view.closed = YES; + self->_view.closed = YES; } }]; } else { closer(); if (explicitlyClosed) { - _view.closed = YES; + self->_view.closed = YES; } } } diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain index 76f6247bd..e28a967bb 160000 --- a/Vendor/xctoolchain +++ b/Vendor/xctoolchain @@ -1 +1 @@ -Subproject commit 76f6247bd6cf770acb71c8d0e767981c96833ab6 +Subproject commit e28a967bba339b6e157f6d2d2426ed5b2c760107 From 93d8107da888eb48a18af3bddbe3a90c65c1b0b2 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 18 Jul 2018 23:50:28 -0700 Subject: [PATCH 2/3] Remove unnecessary podspec source_files (#320) There are 2 changes here: 1. Remove the per platform source_files and public_header_files globs from the Tasks subspec because they are the same for all platforms 2. Remove the empty source_files definitions from the AppLinks subspec. This subspec only supports iOS so these are unnecessary --- Bolts.podspec | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Bolts.podspec b/Bolts.podspec index 7404bf860..f106badc6 100644 --- a/Bolts.podspec +++ b/Bolts.podspec @@ -20,17 +20,8 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '9.0' s.subspec 'Tasks' do |ss| - ss.ios.source_files = 'Bolts/Common/*.[hm]' - ss.ios.public_header_files = 'Bolts/Common/*.h' - - ss.osx.source_files = 'Bolts/Common/*.[hm]' - ss.osx.public_header_files = 'Bolts/Common/*.h' - - ss.watchos.source_files = 'Bolts/Common/*.[hm]' - ss.watchos.public_header_files = 'Bolts/Common/*.h' - - ss.tvos.source_files = 'Bolts/Common/*.[hm]' - ss.tvos.public_header_files = 'Bolts/Common/*.h' + ss.source_files = 'Bolts/Common/*.[hm]' + ss.public_header_files = 'Bolts/Common/*.h' end s.subspec 'AppLinks' do |ss| @@ -39,8 +30,5 @@ Pod::Spec.new do |s| ss.ios.source_files = 'Bolts/iOS/**/*.[hm]' ss.ios.public_header_files = 'Bolts/iOS/*.h' - ss.osx.source_files = '' - ss.watchos.source_files = '' - ss.tvos.source_files = '' end end From 1b247a7047546e9eecd36387a121977b53e2ea43 Mon Sep 17 00:00:00 2001 From: Takeru Chuganji Date: Wed, 26 Sep 2018 09:08:36 -0700 Subject: [PATCH 3/3] Perform clean by deleting build directory instead (#324) --- scripts/build_framework.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build_framework.sh b/scripts/build_framework.sh index b7534aa27..fcf0271c8 100755 --- a/scripts/build_framework.sh +++ b/scripts/build_framework.sh @@ -87,8 +87,8 @@ progress_message Building Framework. # ----------------------------------------------------------------------------- # Compile binaries # -test -d "$BOLTS_BUILD" \ - || mkdir -p "$BOLTS_BUILD" \ +rm -rf "$BOLTS_BUILD" +mkdir -p "$BOLTS_BUILD" \ || die "Could not create directory $BOLTS_BUILD" test -d "$BOLTS_IOS_BUILD" \ @@ -120,7 +120,7 @@ function xcode_build_target() { -configuration "${2}" \ SYMROOT="$BOLTS_BUILD" \ CURRENT_PROJECT_VERSION="$BOLTS_VERSION_FULL" \ - clean build \ + build \ || die "Xcode build failed for platform: ${1}." }