From 72a13511afafa357a3a22c24d391b9baf4207012 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Mon, 1 Feb 2016 13:59:10 -0800 Subject: [PATCH 1/2] Rename Bolts-iOS to Bolts-ObjC. --- Bolts.podspec | 2 +- README.md | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Bolts.podspec b/Bolts.podspec index 6feee252d..54ea4876d 100644 --- a/Bolts.podspec +++ b/Bolts.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/BoltsFramework' s.license = 'BSD' s.authors = 'Parse' - s.source = { :git => 'https://github.com/BoltsFramework/Bolts-iOS.git', :tag => s.version.to_s } + s.source = { :git => 'https://github.com/BoltsFramework/Bolts-ObjC.git', :tag => s.version.to_s } s.documentation_url = 'http://boltsframework.github.io/docs/ios/' s.social_media_url = 'https://twitter.com/ParseIt' s.requires_arc = true diff --git a/README.md b/README.md index 83e03b782..480918921 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,14 @@ Bolts ============ -[![Build Status](http://img.shields.io/travis/BoltsFramework/Bolts-iOS/master.svg?style=flat)](https://travis-ci.org/BoltsFramework/Bolts-iOS) -[![Coverage Status](https://codecov.io/github/BoltsFramework/Bolts-iOS/coverage.svg?branch=master)](https://codecov.io/github/BoltsFramework/Bolts-iOS?branch=master) -[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) -[![Pod Version](http://img.shields.io/cocoapods/v/Bolts.svg?style=flat)](http://cocoadocs.org/docsets/Bolts/) -[![Pod Platform](http://img.shields.io/cocoapods/p/Bolts.svg?style=flat)](http://cocoadocs.org/docsets/Bolts/) -[![Pod License](http://img.shields.io/cocoapods/l/Bolts.svg?style=flat)](https://github.com/BoltsFramework/Bolts-iOS/blob/master/LICENSE) +[![Build Status](https://img.shields.io/travis/BoltsFramework/Bolts-ObjC/master.svg?style=flat)](https://travis-ci.org/BoltsFramework/Bolts-ObjC) +[![Coverage Status](https://codecov.io/github/BoltsFramework/Bolts-ObjC/coverage.svg?branch=master)](https://codecov.io/github/BoltsFramework/Bolts-ObjC?branch=master) +[![Pod Platform](https://img.shields.io/cocoapods/p/Bolts.svg?style=flat)](https://cocoapods.org/pods/Bolts) +[![Pod License](https://img.shields.io/cocoapods/l/Bolts.svg?style=flat)](https://github.com/BoltsFramework/Bolts-ObjC/blob/master/LICENSE) [![Reference Status](https://www.versioneye.com/objective-c/bolts/reference_badge.svg?style=flat)](https://www.versioneye.com/objective-c/bolts/references) +[![Pod Version](https://img.shields.io/cocoapods/v/Bolts.svg?style=flat)](https://cocoapods.org/pods/Bolts) +[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) + Bolts is a collection of low-level libraries designed to make developing mobile apps easier. Bolts was designed by Parse and Facebook for our own internal use, and we have decided to open source these libraries to make them available to @@ -17,7 +18,7 @@ do they require having a Parse or Facebook developer account. Bolts includes: * "Tasks", which make organization of complex asynchronous code more manageable. A task is kind of like a JavaScript Promise, but available for iOS and Android. -* An implementation of the [App Links protocol](http://www.applinks.org), helping you link to content in other apps and handle incoming deep-links. +* An implementation of the [App Links protocol](http://applinks.org/), helping you link to content in other apps and handle incoming deep-links. For more information, see the [Bolts iOS API Reference](http://boltsframework.github.io/docs/ios/). @@ -503,7 +504,7 @@ We are likely to add some concept like this to Bolts at some point in the future # App Links -[App Links](http://www.applinks.org) provide a cross-platform mechanism that allows a developer to define and publish a deep-linking scheme for their content, allowing other apps to link directly to an experience optimized for the device they are running on. Whether you are building an app that receives incoming links or one that may link out to other apps' content, Bolts provides tools to simplify implementation of the [App Links protocol](http://www.applinks.org/documentation). +[App Links](http://applinks.org/) provide a cross-platform mechanism that allows a developer to define and publish a deep-linking scheme for their content, allowing other apps to link directly to an experience optimized for the device they are running on. Whether you are building an app that receives incoming links or one that may link out to other apps' content, Bolts provides tools to simplify implementation of the [App Links protocol](http://applinks.org/documentation). ## Handling an App Link @@ -675,8 +676,8 @@ App Links Measurement Events sends additional information from App Links Intents # Installation -You can download the latest framework files from our [Releases page](https://github.com/BoltsFramework/Bolts-iOS/releases). +You can download the latest framework files from our [Releases page](https://github.com/BoltsFramework/Bolts-ObjC/releases). -Bolts is also available through [CocoaPods](http://cocoapods.org). To install it simply add the following line to your Podfile: +Bolts is also available through [CocoaPods](https://cocoapods.org/). To install it simply add the following line to your Podfile: pod 'Bolts' From c4dd5c2e58e1bee7689e42c1dcaf3351c1974292 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Mon, 1 Feb 2016 15:49:52 -0800 Subject: [PATCH 2/2] Upgrade Carthage on Travis if it's already installed. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 536ae0e38..5d2c6ae57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: pod repo update --silent elif [ "$TEST_TYPE" = Carthage ]; then brew update - brew install carthage + brew install carthage || brew upgrade carthage fi script: - |