Merge b7cf6c9 into 081bb3b

button · Oct 22, 2019 · 06bb2d9 · 06bb2d9
2 parents 081bb3b + b7cf6c9
commit 06bb2d9
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 15 deletions.
diff --git a/ButtonMerchant.xcodeproj/project.pbxproj b/ButtonMerchant.xcodeproj/project.pbxproj
@@ -1534,7 +1534,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1567,7 +1567,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.usebutton.merchant;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
+				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ pod 'ButtonMerchant'
 
 Or, add this to your Cartfile:
 ```
-github "button/button-merchant-ios" ~> 1.0
+github "button/button-merchant-ios" "trainline-button"
 ```
 
 ## Author

diff --git a/Source/ButtonMerchant.swift b/Source/ButtonMerchant.swift
@@ -189,7 +189,6 @@ extension ButtonMerchant {
 
      This method is deprecated and will be removed in a future version. It is safe to remove your usage of this method.
      */
-    @available(*, deprecated, message: "No longer supported. You can safely remove your usage of this method.")
     @objc public static func trackOrder(_ order: Order, completion: ((Error?) -> Void)? = nil) {
         core.trackOrder(order, completion)
     }

diff --git a/Source/Core.swift b/Source/Core.swift
@@ -140,7 +140,6 @@ final internal class Core: CoreType {
         }
     }
 
-    @available(*, deprecated)
     func trackOrder(_ order: Order, _ completion: ((Error?) -> Void)?) {
         guard let appId = applicationId, !appId.isEmpty else {
             if let completion = completion {

diff --git a/Source/Order.swift b/Source/Order.swift
@@ -211,15 +211,13 @@ final public class Order: NSObject, Codable {
 
      This field is no longer supported and will be removed in a future release.
      */
-    @available(*, deprecated)
     private(set) var amount: Int64 = 0
 
     /**
      Deprecated.
 
      If you're migrating to client side order reporting, please use init(id:purchaseDate:lineItems:) instead.
      */
-    @available(*, deprecated, message: "Use init(id:purchaseDate:lineItems:) instead")
     @objc public init(id: String, amount: Int64 = 0, currencyCode: String = "USD") {
         self.id = id
         self.amount = amount

diff --git a/Source/TrackOrderBody.swift b/Source/TrackOrderBody.swift
@@ -44,7 +44,6 @@ internal struct TrackOrderBody: Codable {
         case source
     }
 
-    @available(*, deprecated)
     init(system: SystemType,
          applicationId: String,
          attributionToken: String?,

diff --git a/Tests/UnitTests/ButtonMerchantTests.swift b/Tests/UnitTests/ButtonMerchantTests.swift
@@ -146,7 +146,6 @@ class ButtonMerchantTests: XCTestCase {
         XCTAssertTrue(testCore.didCallFetchPostInstallURL)
     }
 
-    @available(*, deprecated)
     func testTrackOrderInvokesCoreWithOrder() {
         // Arrange
         let testSystem = TestSystem()

diff --git a/Tests/UnitTests/CoreTests.swift b/Tests/UnitTests/CoreTests.swift
@@ -283,7 +283,6 @@ class CoreTests: XCTestCase {
         XCTAssertFalse(core.shouldFetchPostInstallURL)
     }
 
-    @available(*, deprecated)
     func testTrackOrder() {
         // Arrange
         let expectation = XCTestExpectation(description: "track order")
@@ -318,7 +317,6 @@ class CoreTests: XCTestCase {
         self.wait(for: [expectation], timeout: 2.0)
     }
 
-    @available(*, deprecated)
     func testTrackOrderWithoutAttributionToken() {
         // Arrange
         let expectation = XCTestExpectation(description: "track order")
@@ -352,7 +350,6 @@ class CoreTests: XCTestCase {
         self.wait(for: [expectation], timeout: 2.0)
     }
 
-    @available(*, deprecated)
     func testTrackOrderError() {
         // Arrange
         let expectation = XCTestExpectation(description: "track order error")

diff --git a/Tests/UnitTests/OrderTests.swift b/Tests/UnitTests/OrderTests.swift
@@ -100,7 +100,6 @@ class OrderTests: XCTestCase {
         XCTAssertEqual(order.customer, customer)
     }
 
-    @available(*, deprecated)
     func testDictionaryRepresentationIsCorrect_deprecatedInit() {
         // Arrange
         let id = "derp123"

diff --git a/Tests/UnitTests/TrackOrderBodyTests.swift b/Tests/UnitTests/TrackOrderBodyTests.swift
@@ -27,7 +27,6 @@ import XCTest
 
 class TrackOrderBodyTests: XCTestCase {
 
-    @available(*, deprecated)
     func testInitialization() {
         let order = Order(id: "order-abc", amount: 99)
         let body = TrackOrderBody(system: TestSystem(),
@@ -43,7 +42,6 @@ class TrackOrderBodyTests: XCTestCase {
         XCTAssertEqual(body.source, "merchant-library")
     }
 
-    @available(*, deprecated)
     func testSerializationToDictionary() {
         let order = Order(id: "order-abc", amount: 99)
         let body = TrackOrderBody(system: TestSystem(),