Merge branch 'master' into develop

LICENSE

+The MIT License (MIT)
+
 Copyright (c) 2015 Shopify
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

Mobile Buy SDK/Mobile Buy SDK/Models/BUYOrder.h

@@ -24,7 +24,7 @@
 //  THE SOFTWARE.
 //
 
-#import <Buy/Buy.h>
+#import "BUYObject.h"
 
 @interface BUYOrder : BUYObject
 

Mobile-Buy-SDK.podspec

 Pod::Spec.new do |s|
   s.name         = 'Mobile-Buy-SDK'
-  s.version      = '1.1.5'
+  s.version      = '1.2.0'
   s.summary      = 'Sell with Shopify in iOS apps'
   s.description  = 'Shopify’s Mobile Buy SDK makes it simple to sell physical products inside your mobile app. With a few lines of code, you can connect your app with the Shopify platform and let your users buy your products using Apple Pay or their credit card.'
   s.homepage     = 'https://developers.shopify.com/mobile-buy-sdk'
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author       = 'Shopify Inc.'
   s.platform     = :ios, '8.0'
-  s.source       = { :git => 'https://github.com/Shopify/mobile-buy-sdk-ios-private.git', :branch => 'task/cocoapods' }
+  s.source       = { :git => 'https://github.com/Shopify/mobile-buy-sdk-ios.git', :tag => s.version }
   s.source_files = 'Mobile Buy SDK/Mobile Buy SDK/**/*.{h,m,mm}'
   s.exclude_files = 'Mobile Buy SDK/Mobile Buy SDK/Buy.h'
   s.public_header_files = 'Mobile Buy SDK/Mobile Buy SDK/**/*.{h}'

README.md

@@ -3,7 +3,7 @@
 [![Build status](https://badge.buildkite.com/d8fe8aa44d801c6238ab767867e4fb09abe516bb2933b577cc.svg?branch=develop)](https://buildkite.com/shopify/mobile-buy-sdk-ios)
 [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/Shopify/mobile-buy-sdk-ios/blob/master/LICENSE)
 [![GitHub release](https://img.shields.io/github/release/shopify/mobile-buy-sdk-ios.svg)](https://github.com/Shopify/mobile-buy-sdk-ios/releases)
-[![Cocoapods](https://img.shields.io/cocoapods/v/mobile-buy-sdk-ios.svg)](https://cocoapods.org/pods/mobile-buy-sdk-ios)
+[![Cocoapods](https://img.shields.io/cocoapods/v/mobile-buy-sdk.svg)](https://cocoapods.org/pods/mobile-buy-sdk)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 # Mobile Buy SDK for iOS