From a902ac122c8a2cd3675467d5c5c8588de515cb64 Mon Sep 17 00:00:00 2001 From: Diogo Guimaraes Date: Wed, 14 Oct 2015 12:57:39 +0100 Subject: [PATCH] Update branding --- .travis.yml | 2 +- BitreserveSdk.podspec.json | 29 ------ Example.xcodeproj/project.pbxproj | 46 +++++---- Example/ViewController.swift | 2 +- LICENSE | 3 +- README.md | 10 +- ...reserveClient.swift => UpholdClient.swift} | 4 +- Source/Service/ReserveService.swift | 8 +- Source/Service/TickerService.swift | 4 +- Source/Service/UserCardService.swift | 16 ++-- Source/Service/UserService.swift | 14 +-- Tests/Integration/Model/CardTest.swift | 2 +- Tests/Integration/Model/RateTest.swift | 2 +- Tests/Integration/Model/TransactionTest.swift | 2 +- Tests/Integration/Model/UserTest.swift | 2 +- .../Service/ReserveServiceTest.swift | 10 +- .../Service/TickerServiceTest.swift | 6 +- .../Service/UserCardServiceTest.swift | 18 ++-- .../Integration/Service/UserServiceTest.swift | 16 ++-- UpholdSdk.podspec.json | 29 ++++++ .../project.pbxproj | 94 +++++++++---------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/xcschemes/UpholdSdk.xcscheme | 30 +++--- 23 files changed, 171 insertions(+), 180 deletions(-) delete mode 100644 BitreserveSdk.podspec.json rename Source/Client/{BitreserveClient.swift => UpholdClient.swift} (52%) create mode 100644 UpholdSdk.podspec.json rename {BitreserveSdk.xcodeproj => UpholdSdk.xcodeproj}/project.pbxproj (90%) rename {BitreserveSdk.xcodeproj => UpholdSdk.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (68%) rename BitreserveSdk.xcodeproj/xcshareddata/xcschemes/BitreserveSdk.xcscheme => UpholdSdk.xcodeproj/xcshareddata/xcschemes/UpholdSdk.xcscheme (76%) diff --git a/.travis.yml b/.travis.yml index e079f75..48f434c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,4 @@ before_script: script: - swiftlint lint - - xctool -project BitreserveSdk.xcodeproj -scheme BitreserveSdk test sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + - xctool -project UpholdSdk.xcodeproj -scheme UpholdSdk test sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO diff --git a/BitreserveSdk.podspec.json b/BitreserveSdk.podspec.json deleted file mode 100644 index 3f0b110..0000000 --- a/BitreserveSdk.podspec.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "BitreserveSdk", - "version": "0.1.0", - "summary": "The Bitreserve Swift SDK", - "description": "Bitreserve Swift SDK\n\nThis SDK provides an abstraction from the bitreserve api.\nMore information of the Bitreserve developer tools available at: https://developer.bitreserve.org", - "homepage": "https://github.com/bitreserve/bitreserve-sdk-ios", - "license": "MIT", - "authors": { - "Diogo Guimarães": "guimaraes@bitreserve.org", - "Sandro Machado": "sandro@bitreserve.org" - }, - "source": { - "git": "https://github.com/bitreserve/bitreserve-sdk-ios.git", - "tag": "0.1.0" - }, - "platforms": { - "ios": "9.0" - }, - "requires_arc": true, - "source_files": "Source/**/*", - "dependencies": { - "SwiftClient": [ - "~> 2.0" - ], - "ObjectMapper": [ - "~> 0.18" - ] - } -} diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj index 1aba1e3..e061d45 100644 --- a/Example.xcodeproj/project.pbxproj +++ b/Example.xcodeproj/project.pbxproj @@ -12,23 +12,22 @@ BC2381161BB461DE0060CC80 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC2381141BB461DE0060CC80 /* Main.storyboard */; }; BC2381181BB461DE0060CC80 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BC2381171BB461DE0060CC80 /* Assets.xcassets */; }; BC23811B1BB461DE0060CC80 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC2381191BB461DE0060CC80 /* LaunchScreen.storyboard */; }; - BC2381C91BB465420060CC80 /* BitreserveSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC2381C61BB465260060CC80 /* BitreserveSdk.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - BC2381C51BB465260060CC80 /* PBXContainerItemProxy */ = { + BC7C7BEB1BCE782C00CB0CDD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */; + containerPortal = BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */; proxyType = 2; remoteGlobalIDString = BC23812C1BB462170060CC80; - remoteInfo = BitreserveSdk; + remoteInfo = UpholdSdk; }; - BC2381C71BB465260060CC80 /* PBXContainerItemProxy */ = { + BC7C7BED1BCE782C00CB0CDD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */; + containerPortal = BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */; proxyType = 2; remoteGlobalIDString = BC2381361BB462180060CC80; - remoteInfo = BitreserveSdkTests; + remoteInfo = UpholdSdkTests; }; /* End PBXContainerItemProxy section */ @@ -40,7 +39,7 @@ BC2381171BB461DE0060CC80 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; BC23811A1BB461DE0060CC80 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; BC23811C1BB461DE0060CC80 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = BitreserveSdk.xcodeproj; sourceTree = ""; }; + BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = UpholdSdk.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -48,7 +47,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BC2381C91BB465420060CC80 /* BitreserveSdk.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -58,7 +56,7 @@ BC2381041BB461DE0060CC80 = { isa = PBXGroup; children = ( - BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */, + BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */, BC23810F1BB461DE0060CC80 /* Example */, BC23810E1BB461DE0060CC80 /* Products */, ); @@ -85,11 +83,11 @@ path = Example; sourceTree = ""; }; - BC2381BF1BB465260060CC80 /* Products */ = { + BC7C7BE71BCE782B00CB0CDD /* Products */ = { isa = PBXGroup; children = ( - BC2381C61BB465260060CC80 /* BitreserveSdk.framework */, - BC2381C81BB465260060CC80 /* BitreserveSdkTests.xctest */, + BC7C7BEC1BCE782C00CB0CDD /* UpholdSdk.framework */, + BC7C7BEE1BCE782C00CB0CDD /* UpholdSdk.xctest */, ); name = Products; sourceTree = ""; @@ -121,7 +119,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0700; - ORGANIZATIONNAME = Bitreserve; + ORGANIZATIONNAME = Uphold; TargetAttributes = { BC23810C1BB461DE0060CC80 = { CreatedOnToolsVersion = 7.0; @@ -141,8 +139,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = BC2381BF1BB465260060CC80 /* Products */; - ProjectRef = BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */; + ProductGroup = BC7C7BE71BCE782B00CB0CDD /* Products */; + ProjectRef = BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */; }, ); projectRoot = ""; @@ -153,18 +151,18 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - BC2381C61BB465260060CC80 /* BitreserveSdk.framework */ = { + BC7C7BEC1BCE782C00CB0CDD /* UpholdSdk.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = BitreserveSdk.framework; - remoteRef = BC2381C51BB465260060CC80 /* PBXContainerItemProxy */; + path = UpholdSdk.framework; + remoteRef = BC7C7BEB1BCE782C00CB0CDD /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - BC2381C81BB465260060CC80 /* BitreserveSdkTests.xctest */ = { + BC7C7BEE1BCE782C00CB0CDD /* UpholdSdk.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = BitreserveSdkTests.xctest; - remoteRef = BC2381C71BB465260060CC80 /* PBXContainerItemProxy */; + path = UpholdSdk.xctest; + remoteRef = BC7C7BED1BCE782C00CB0CDD /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -303,7 +301,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.bitreserve.example; + PRODUCT_BUNDLE_IDENTIFIER = com.uphold.example; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; }; @@ -315,7 +313,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.bitreserve.example; + PRODUCT_BUNDLE_IDENTIFIER = com.uphold.example; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = 1; }; diff --git a/Example/ViewController.swift b/Example/ViewController.swift index 2647165..9fd0787 100644 --- a/Example/ViewController.swift +++ b/Example/ViewController.swift @@ -1,5 +1,5 @@ import UIKit -import BitreserveSdk +import UpholdSdk class ViewController: UIViewController { } diff --git a/LICENSE b/LICENSE index 7bf5b55..7363246 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Bitreserve +Copyright (c) 2015 Uphold Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/README.md b/README.md index 921ec0b..a123327 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Bitreserve SDK for iOS +# Uphold SDK for iOS -Bitreserve is a next generation platform that allows anyone to transfer and exchange value for free, instantly and securely. +Uphold is a next generation platform that allows anyone to transfer and exchange value for free, instantly and securely. -The Bitreserve SDK for iOS provides an easy way for developers to integrate iOS applications with the [Bitreserve API](https://developers.bitreserve.org). +The Uphold SDK for iOS provides an easy way for developers to integrate iOS applications with the [Uphold API](https://uphold.com/en/developer/api). ## Requirements @@ -20,7 +20,7 @@ The Bitreserve SDK for iOS provides an easy way for developers to integrate iOS platform :ios, '9.0' use_frameworks! - pod 'BitreserveSdk' + pod 'UpholdSdk' ``` 2. Run `pod install`. @@ -30,7 +30,7 @@ The Bitreserve SDK for iOS provides an easy way for developers to integrate iOS 1. Create `Cartfile`. ``` - github "bitreserve/bitreserve-sdk-ios" ~> 0.1.0 + github "uphold/uphold-sdk-ios" ~> 0.1.0 ``` 2. Run `carthage update --platform iOS`. diff --git a/Source/Client/BitreserveClient.swift b/Source/Client/UpholdClient.swift similarity index 52% rename from Source/Client/BitreserveClient.swift rename to Source/Client/UpholdClient.swift index ff1755a..54d33df 100644 --- a/Source/Client/BitreserveClient.swift +++ b/Source/Client/UpholdClient.swift @@ -1,12 +1,12 @@ import Foundation import SwiftClient -public class BitreserveClient: Client { +public class UpholdClient: Client { public override init() { super.init() - self.baseUrl("https://api.bitreserve.org") + self.baseUrl("https://api.uphold.com") } } diff --git a/Source/Service/ReserveService.swift b/Source/Service/ReserveService.swift index b962931..430ad55 100644 --- a/Source/Service/ReserveService.swift +++ b/Source/Service/ReserveService.swift @@ -12,7 +12,7 @@ public class ReserveService { - returns: A request to get the reserve ledger. */ static func getLedger(range: String) -> Request { - return BitreserveClient().get("/v0/reserve/ledger").set("Range", range) + return UpholdClient().get("/v0/reserve/ledger").set("Range", range) } /** @@ -23,7 +23,7 @@ public class ReserveService { - returns: A request to get a reserve transaction. */ static func getReserveTransactionById(transactionId: String) -> Request { - return BitreserveClient().get(String(format: "/v0/reserve/transactions/%@", transactionId)) + return UpholdClient().get(String(format: "/v0/reserve/transactions/%@", transactionId)) } /** @@ -34,7 +34,7 @@ public class ReserveService { - returns: A request to get the reserve transactions. */ static func getReserveTransactions(range: String) -> Request { - return BitreserveClient().get("/v0/reserve/transactions").set("Range", range) + return UpholdClient().get("/v0/reserve/transactions").set("Range", range) } /** @@ -43,7 +43,7 @@ public class ReserveService { - returns: A request to get the reserve statistics. */ static func getStatistics() -> Request { - return BitreserveClient().get("/v0/reserve/statistics") + return UpholdClient().get("/v0/reserve/statistics") } } diff --git a/Source/Service/TickerService.swift b/Source/Service/TickerService.swift index 0c697fd..1eac835 100644 --- a/Source/Service/TickerService.swift +++ b/Source/Service/TickerService.swift @@ -10,7 +10,7 @@ public class TickerService { - returns: A request to get the tickers on the system. */ static func getAllTickers() -> Request { - return BitreserveClient().get("/v0/ticker") + return UpholdClient().get("/v0/ticker") } /** @@ -21,7 +21,7 @@ public class TickerService { - returns: A request to get the tickers on the system for the selected currency. */ static func getAllTickersByCurrency(currency: String) -> Request { - return BitreserveClient().get(String(format: "/v0/ticker/%@", currency)) + return UpholdClient().get(String(format: "/v0/ticker/%@", currency)) } } diff --git a/Source/Service/UserCardService.swift b/Source/Service/UserCardService.swift index 1ba8b43..b7121d8 100644 --- a/Source/Service/UserCardService.swift +++ b/Source/Service/UserCardService.swift @@ -13,7 +13,7 @@ public class UserCardService { - returns: A request to cancel the transaction. */ static func cancelTransaction(cardId: String, transactionId: String) -> Request { - return BitreserveClient().get(String(format: "/v0/me/cards/%@/transactions/%@/cancel", cardId, transactionId)) + return UpholdClient().get(String(format: "/v0/me/cards/%@/transactions/%@/cancel", cardId, transactionId)) } /** @@ -25,7 +25,7 @@ public class UserCardService { - returns: A request to confirm the transaction. */ static func confirmTransaction(cardId: String, transactionId: String, message: String) -> Request { - return BitreserveClient().post(String(format: "/v0/me/cards/%@/transactions/%@/commit", cardId, transactionId)).send(message) + return UpholdClient().post(String(format: "/v0/me/cards/%@/transactions/%@/commit", cardId, transactionId)).send(message) } /** @@ -38,7 +38,7 @@ public class UserCardService { - returns: A request to create a transaction. */ static func createTransaction(cardId: String, transactionId: String, transactionRequest: String) -> Request { - return BitreserveClient().post(String(format: "/v0/me/cards/%@/transactions/%@/commit", cardId, transactionId)).send(transactionRequest) + return UpholdClient().post(String(format: "/v0/me/cards/%@/transactions/%@/commit", cardId, transactionId)).send(transactionRequest) } /** @@ -49,7 +49,7 @@ public class UserCardService { - returns: A request to create a card. */ static func createUserCard(cardRequest: String) -> Request { - return BitreserveClient().post("/v0/me/cards").send(cardRequest) + return UpholdClient().post("/v0/me/cards").send(cardRequest) } /** @@ -60,7 +60,7 @@ public class UserCardService { - returns: A request to create a transaction. */ static func getUserCardById(cardId: String) -> Request { - return BitreserveClient().get(String(format: "/v0/me/cards/%@", cardId)) + return UpholdClient().get(String(format: "/v0/me/cards/%@", cardId)) } /** @@ -69,7 +69,7 @@ public class UserCardService { - returns: A request to get the user cards. */ static func getUserCards() -> Request { - return BitreserveClient().get("/v0/me/cards") + return UpholdClient().get("/v0/me/cards") } /** @@ -81,7 +81,7 @@ public class UserCardService { - returns: A request to get the list of transactions for a card. */ static func getUserCardTransactions(cardId: String, range: String) -> Request { - return BitreserveClient().get(String(format: "/v0/me/cards/%@/transactions", cardId)).set("Range", range) + return UpholdClient().get(String(format: "/v0/me/cards/%@/transactions", cardId)).set("Range", range) } /** @@ -93,7 +93,7 @@ public class UserCardService { - returns: A request to update a card. */ static func updateCard(cardId: String, updateFields: String) -> Request { - return BitreserveClient().patch(String(format: "/v0/me/cards/%@", cardId)).send(updateFields) + return UpholdClient().patch(String(format: "/v0/me/cards/%@", cardId)).send(updateFields) } } diff --git a/Source/Service/UserService.swift b/Source/Service/UserService.swift index 7398b78..66826ab 100644 --- a/Source/Service/UserService.swift +++ b/Source/Service/UserService.swift @@ -12,7 +12,7 @@ public class UserService { - returns: A request to create a contact. */ static func createContact(contactRequest: String) -> Request { - return BitreserveClient().post("/v0/me/contacts").send(contactRequest) + return UpholdClient().post("/v0/me/contacts").send(contactRequest) } /** @@ -21,7 +21,7 @@ public class UserService { - returns: A request to get the user information. */ static func getUser() -> Request { - return BitreserveClient().get("/v0/me") + return UpholdClient().get("/v0/me") } /** @@ -30,7 +30,7 @@ public class UserService { - returns: A request to get the user balances. */ static func getUserBalances() -> Request { - return BitreserveClient().get("/v0/me") + return UpholdClient().get("/v0/me") } /** @@ -39,7 +39,7 @@ public class UserService { - returns: A request to get the user contacts. */ static func getUserContacts() -> Request { - return BitreserveClient().get("/v0/me/contacts") + return UpholdClient().get("/v0/me/contacts") } /** @@ -48,7 +48,7 @@ public class UserService { - returns: A request to get the user phones. */ static func getUserPhones() -> Request { - return BitreserveClient().get("/v0/me/phones") + return UpholdClient().get("/v0/me/phones") } /** @@ -59,7 +59,7 @@ public class UserService { - returns: A request to get the user transactions. */ static func getUserTransactions(range: String) -> Request { - return BitreserveClient().get("/v0/me/transactions").set("Range", range) + return UpholdClient().get("/v0/me/transactions").set("Range", range) } /** @@ -70,7 +70,7 @@ public class UserService { - returns: A request to update the user information. */ static func updateUser(updatefields: String) -> Request { - return BitreserveClient().patch("/v0/me").send(updatefields) + return UpholdClient().patch("/v0/me").send(updatefields) } } diff --git a/Tests/Integration/Model/CardTest.swift b/Tests/Integration/Model/CardTest.swift index b63b205..ab1412a 100644 --- a/Tests/Integration/Model/CardTest.swift +++ b/Tests/Integration/Model/CardTest.swift @@ -1,5 +1,5 @@ import XCTest -import BitreserveSdk +import UpholdSdk import ObjectMapper class CardTest: XCTestCase { diff --git a/Tests/Integration/Model/RateTest.swift b/Tests/Integration/Model/RateTest.swift index a81e02e..d262653 100644 --- a/Tests/Integration/Model/RateTest.swift +++ b/Tests/Integration/Model/RateTest.swift @@ -1,5 +1,5 @@ import XCTest -import BitreserveSdk +import UpholdSdk import ObjectMapper diff --git a/Tests/Integration/Model/TransactionTest.swift b/Tests/Integration/Model/TransactionTest.swift index 74f0772..932eb7e 100644 --- a/Tests/Integration/Model/TransactionTest.swift +++ b/Tests/Integration/Model/TransactionTest.swift @@ -1,5 +1,5 @@ import XCTest -import BitreserveSdk +import UpholdSdk import ObjectMapper class TransactionTest: XCTestCase { diff --git a/Tests/Integration/Model/UserTest.swift b/Tests/Integration/Model/UserTest.swift index c943e94..a262a40 100644 --- a/Tests/Integration/Model/UserTest.swift +++ b/Tests/Integration/Model/UserTest.swift @@ -1,5 +1,5 @@ import XCTest -import BitreserveSdk +import UpholdSdk import ObjectMapper class UserTest: XCTestCase { diff --git a/Tests/Integration/Service/ReserveServiceTest.swift b/Tests/Integration/Service/ReserveServiceTest.swift index ea84389..e86f66c 100644 --- a/Tests/Integration/Service/ReserveServiceTest.swift +++ b/Tests/Integration/Service/ReserveServiceTest.swift @@ -1,5 +1,5 @@ import XCTest -@testable import BitreserveSdk +@testable import UpholdSdk @testable import SwiftClient /// ReserveService integration tests. @@ -8,7 +8,7 @@ class ReserveServiceTest: XCTestCase { func testGetLedgerShouldReturnTheRequest() { let request = ReserveService.getLedger("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/reserve/ledger", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/reserve/ledger", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") XCTAssertNotNil(request.headers["Range"], "Failed: Range header doesn't exist.") XCTAssertEqual(request.headers["Range"]!, "foo", "Failed: Range value doesn't match.") @@ -17,14 +17,14 @@ class ReserveServiceTest: XCTestCase { func testGetReserveTransactionByIdShouldReturnTheRequest() { let request = ReserveService.getReserveTransactionById("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/reserve/transactions/foo", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/reserve/transactions/foo", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetReserveTransactionsShouldReturnTheRequest() { let request = ReserveService.getReserveTransactions("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/reserve/transactions", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/reserve/transactions", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") XCTAssertNotNil(request.headers["Range"], "Failed: Range header doesn't exist.") XCTAssertEqual(request.headers["Range"]!, "foo", "Failed: Range value doesn't match.") @@ -33,7 +33,7 @@ class ReserveServiceTest: XCTestCase { func testGetStatisticsShouldReturnTheRequest() { let request = ReserveService.getStatistics() - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/reserve/statistics", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/reserve/statistics", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } diff --git a/Tests/Integration/Service/TickerServiceTest.swift b/Tests/Integration/Service/TickerServiceTest.swift index ced4c69..c7eee1b 100644 --- a/Tests/Integration/Service/TickerServiceTest.swift +++ b/Tests/Integration/Service/TickerServiceTest.swift @@ -1,5 +1,5 @@ import XCTest -@testable import BitreserveSdk +@testable import UpholdSdk @testable import SwiftClient /// TickerService integration tests. @@ -8,14 +8,14 @@ class TickerServiceTest: XCTestCase { func testGetAllTickersShouldReturnTheRequest() { let request = TickerService.getAllTickers() - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/ticker", "Failed: Wrong URL") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/ticker", "Failed: Wrong URL") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetAllTickersByCurrencyShouldReturnTheRequest() { let request = TickerService.getAllTickersByCurrency("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/ticker/foo", "Failed: Wrong URL") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/ticker/foo", "Failed: Wrong URL") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } diff --git a/Tests/Integration/Service/UserCardServiceTest.swift b/Tests/Integration/Service/UserCardServiceTest.swift index d78e3a1..38eaae5 100644 --- a/Tests/Integration/Service/UserCardServiceTest.swift +++ b/Tests/Integration/Service/UserCardServiceTest.swift @@ -1,5 +1,5 @@ import XCTest -@testable import BitreserveSdk +@testable import UpholdSdk @testable import SwiftClient /// UserCardService integration tests. @@ -8,14 +8,14 @@ class UserCardServiceTest: XCTestCase { func testCancelTransactionShouldReturnTheRequest() { let request = UserCardService.cancelTransaction("bar", transactionId: "foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards/bar/transactions/foo/cancel", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards/bar/transactions/foo/cancel", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testConfirmTransactionShouldReturnTheRequest() { let request = UserCardService.confirmTransaction("bar", transactionId: "foo", message: "foobar") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards/bar/transactions/foo/commit", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards/bar/transactions/foo/commit", "Failed: Wrong URL.") XCTAssertEqual(request.method, "POST", "Failed: Wrong method.") XCTAssertEqual(request.data! as? String, "foobar", "Failed: Wrong body.") } @@ -23,7 +23,7 @@ class UserCardServiceTest: XCTestCase { func testCreateTransactionShouldReturnTheRequest() { let request = UserCardService.createTransaction("bar", transactionId: "foo", transactionRequest: "foobar") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards/bar/transactions/foo/commit", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards/bar/transactions/foo/commit", "Failed: Wrong URL.") XCTAssertEqual(request.method, "POST", "Failed: Wrong method.") XCTAssertEqual(request.data! as? String, "foobar", "Failed: Wrong body.") } @@ -31,7 +31,7 @@ class UserCardServiceTest: XCTestCase { func testCreateUserCardShouldReturnTheRequest() { let request = UserCardService.createUserCard("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards", "Failed: Wrong URL.") XCTAssertEqual(request.method, "POST", "Failed: Wrong method.") XCTAssertEqual(request.data! as? String, "foo", "Failed: Wrong body.") } @@ -39,21 +39,21 @@ class UserCardServiceTest: XCTestCase { func testGetUserCardByIdShouldReturnTheRequest() { let request = UserCardService.getUserCardById("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards/foo", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards/foo", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetUserCardsShouldReturnTheRequest() { let request = UserCardService.getUserCards() - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetUserCardTransactionsShouldReturnTheRequest() { let request = UserCardService.getUserCardTransactions("bar", range: "foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards/bar/transactions", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards/bar/transactions", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") XCTAssertNotNil(request.headers["Range"], "Failed: Range header doesn't exist.") XCTAssertEqual(request.headers["Range"]!, "foo", "Failed: Range value doesn't match.") @@ -62,7 +62,7 @@ class UserCardServiceTest: XCTestCase { func testUpdateCardShouldReturnTheRequest() { let request = UserCardService.updateCard("bar", updateFields: "foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/cards/bar", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/cards/bar", "Failed: Wrong URL.") XCTAssertEqual(request.method, "PATCH", "Failed: Wrong method.") XCTAssertEqual(request.data! as? String, "foo", "Failed: Wrong body.") } diff --git a/Tests/Integration/Service/UserServiceTest.swift b/Tests/Integration/Service/UserServiceTest.swift index 1b79c5e..61844cb 100644 --- a/Tests/Integration/Service/UserServiceTest.swift +++ b/Tests/Integration/Service/UserServiceTest.swift @@ -1,5 +1,5 @@ import XCTest -@testable import BitreserveSdk +@testable import UpholdSdk @testable import SwiftClient /// UserService integration tests. @@ -8,7 +8,7 @@ class UserServiceTest: XCTestCase { func testCreateContactShouldReturnTheRequest() { let request = UserService.createContact("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/contacts", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/contacts", "Failed: Wrong URL.") XCTAssertEqual(request.method, "POST", "Failed: Wrong method.") XCTAssertEqual(request.data! as? String, "foo", "Failed: Wrong body.") } @@ -16,35 +16,35 @@ class UserServiceTest: XCTestCase { func testGetUserShouldReturnTheRequest() { let request = UserService.getUser() - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetUserBalancesShouldReturnTheRequest() { let request = UserService.getUserBalances() - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetUserContactsShouldReturnTheRequest() { let request = UserService.getUserContacts() - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/contacts", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/contacts", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetUserPhonesShouldReturnTheRequest() { let request = UserService.getUserPhones() - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/phones", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/phones", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") } func testGetUserTransactionsShouldReturnTheRequest() { let request = UserService.getUserTransactions("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me/transactions", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me/transactions", "Failed: Wrong URL.") XCTAssertEqual(request.method, "GET", "Failed: Wrong method.") XCTAssertNotNil(request.headers["Range"], "Failed: Range header doesn't exist.") XCTAssertEqual(request.headers["Range"]!, "foo", "Failed: Range value doesn't match.") @@ -53,7 +53,7 @@ class UserServiceTest: XCTestCase { func testUpdateUserShouldReturnTheRequest() { let request = UserService.updateUser("foo") - XCTAssertEqual(request.url, "https://api.bitreserve.org/v0/me", "Failed: Wrong URL.") + XCTAssertEqual(request.url, "https://api.uphold.com/v0/me", "Failed: Wrong URL.") XCTAssertEqual(request.method, "PATCH", "Failed: Wrong method.") XCTAssertEqual(request.data! as? String, "foo", "Failed: Wrong body.") } diff --git a/UpholdSdk.podspec.json b/UpholdSdk.podspec.json new file mode 100644 index 0000000..f0be353 --- /dev/null +++ b/UpholdSdk.podspec.json @@ -0,0 +1,29 @@ +{ + "name": "UpholdSdk", + "version": "0.1.0", + "summary": "The Uphold Swift SDK", + "description": "Uphold Swift SDK\n\nThis SDK provides an abstraction from the Uphold api.\nMore information of the Uphold developer tools available at: https://uphold.com/en/developer/api", + "homepage": "https://github.com/uphold/uphold-sdk-ios", + "license": "MIT", + "authors": { + "Diogo Guimarães": "guimaraes@uphold.org", + "Sandro Machado": "sandro@uphold.org" + }, + "source": { + "git": "https://github.com/uphold/uphold-sdk-ios.git", + "tag": "0.1.0" + }, + "platforms": { + "ios": "9.0" + }, + "requires_arc": true, + "source_files": "Source/**/*", + "dependencies": { + "SwiftClient": [ + "~> 2.0" + ], + "ObjectMapper": [ + "~> 0.18" + ] + } +} diff --git a/BitreserveSdk.xcodeproj/project.pbxproj b/UpholdSdk.xcodeproj/project.pbxproj similarity index 90% rename from BitreserveSdk.xcodeproj/project.pbxproj rename to UpholdSdk.xcodeproj/project.pbxproj index 606d69b..6b6ae58 100644 --- a/BitreserveSdk.xcodeproj/project.pbxproj +++ b/UpholdSdk.xcodeproj/project.pbxproj @@ -7,9 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - BC2381371BB462180060CC80 /* BitreserveSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC23812C1BB462170060CC80 /* BitreserveSdk.framework */; settings = {ASSET_TAGS = (); }; }; - BC2381621BB4626F0060CC80 /* BitreserveClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC2381481BB4626F0060CC80 /* BitreserveClient.swift */; settings = {ASSET_TAGS = (); }; }; - BC2381641BB4626F0060CC80 /* Address.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC23814C1BB4626F0060CC80 /* Address.swift */; settings = {ASSET_TAGS = (); }; }; + BC2381621BB4626F0060CC80 /* UpholdClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC2381481BB4626F0060CC80 /* UpholdClient.swift */; settings = {ASSET_TAGS = (); }; }; BC2381651BB4626F0060CC80 /* CardSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC23814D1BB4626F0060CC80 /* CardSettings.swift */; settings = {ASSET_TAGS = (); }; }; BC2381661BB4626F0060CC80 /* Normalized.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC23814E1BB4626F0060CC80 /* Normalized.swift */; settings = {ASSET_TAGS = (); }; }; BC2381671BB4626F0060CC80 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC23814F1BB4626F0060CC80 /* Card.swift */; settings = {ASSET_TAGS = (); }; }; @@ -41,13 +39,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - BC2381381BB462180060CC80 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BC2381231BB462170060CC80 /* Project object */; - proxyType = 1; - remoteGlobalIDString = BC23812B1BB462170060CC80; - remoteInfo = BitreserveSdk; - }; BC2381A91BB464B00060CC80 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BC2381A11BB464B00060CC80 /* ObjectMapper.xcodeproj */; @@ -97,14 +88,20 @@ remoteGlobalIDString = D0CB88E119FC645300DA6940; remoteInfo = SwiftClientTests; }; + BC6BEE221BCEACBA0090656F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = BC2381231BB462170060CC80 /* Project object */; + proxyType = 1; + remoteGlobalIDString = BC23812B1BB462170060CC80; + remoteInfo = UpholdSdk; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - BC23812C1BB462170060CC80 /* BitreserveSdk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BitreserveSdk.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BC2381361BB462180060CC80 /* BitreserveSdkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BitreserveSdkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - BC2381481BB4626F0060CC80 /* BitreserveClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitreserveClient.swift; sourceTree = ""; }; + BC23812C1BB462170060CC80 /* UpholdSdk.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UpholdSdk.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BC2381361BB462180060CC80 /* UpholdSdkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UpholdSdkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + BC2381481BB4626F0060CC80 /* UpholdClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpholdClient.swift; sourceTree = ""; }; BC2381491BB4626F0060CC80 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BC23814C1BB4626F0060CC80 /* Address.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Address.swift; sourceTree = ""; }; BC23814D1BB4626F0060CC80 /* CardSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardSettings.swift; sourceTree = ""; }; BC23814E1BB4626F0060CC80 /* Normalized.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Normalized.swift; sourceTree = ""; }; BC23814F1BB4626F0060CC80 /* Card.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Card.swift; sourceTree = ""; }; @@ -150,7 +147,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BC2381371BB462180060CC80 /* BitreserveSdk.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -170,8 +166,8 @@ BC23812D1BB462170060CC80 /* Products */ = { isa = PBXGroup; children = ( - BC23812C1BB462170060CC80 /* BitreserveSdk.framework */, - BC2381361BB462180060CC80 /* BitreserveSdkTests.xctest */, + BC23812C1BB462170060CC80 /* UpholdSdk.framework */, + BC2381361BB462180060CC80 /* UpholdSdkTests.xctest */, ); name = Products; sourceTree = ""; @@ -190,7 +186,7 @@ BC2381471BB4626F0060CC80 /* Client */ = { isa = PBXGroup; children = ( - BC2381481BB4626F0060CC80 /* BitreserveClient.swift */, + BC2381481BB4626F0060CC80 /* UpholdClient.swift */, ); path = Client; sourceTree = ""; @@ -212,7 +208,6 @@ BC23814B1BB4626F0060CC80 /* Card */ = { isa = PBXGroup; children = ( - BC23814C1BB4626F0060CC80 /* Address.swift */, BC23814D1BB4626F0060CC80 /* CardSettings.swift */, BC23814E1BB4626F0060CC80 /* Normalized.swift */, ); @@ -335,9 +330,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - BC23812B1BB462170060CC80 /* BitreserveSdk */ = { + BC23812B1BB462170060CC80 /* UpholdSdk */ = { isa = PBXNativeTarget; - buildConfigurationList = BC2381401BB462180060CC80 /* Build configuration list for PBXNativeTarget "BitreserveSdk" */; + buildConfigurationList = BC2381401BB462180060CC80 /* Build configuration list for PBXNativeTarget "UpholdSdk" */; buildPhases = ( BC2381271BB462170060CC80 /* Sources */, BC2381281BB462170060CC80 /* Frameworks */, @@ -349,14 +344,14 @@ ); dependencies = ( ); - name = BitreserveSdk; - productName = BitreserveSdk; - productReference = BC23812C1BB462170060CC80 /* BitreserveSdk.framework */; + name = UpholdSdk; + productName = UpholdSdk; + productReference = BC23812C1BB462170060CC80 /* UpholdSdk.framework */; productType = "com.apple.product-type.framework"; }; - BC2381351BB462180060CC80 /* BitreserveSdkTests */ = { + BC2381351BB462180060CC80 /* UpholdSdkTests */ = { isa = PBXNativeTarget; - buildConfigurationList = BC2381431BB462180060CC80 /* Build configuration list for PBXNativeTarget "BitreserveSdkTests" */; + buildConfigurationList = BC2381431BB462180060CC80 /* Build configuration list for PBXNativeTarget "UpholdSdkTests" */; buildPhases = ( BC2381321BB462180060CC80 /* Sources */, BC2381331BB462180060CC80 /* Frameworks */, @@ -365,11 +360,11 @@ buildRules = ( ); dependencies = ( - BC2381391BB462180060CC80 /* PBXTargetDependency */, + BC6BEE231BCEACBA0090656F /* PBXTargetDependency */, ); - name = BitreserveSdkTests; - productName = BitreserveSdkTests; - productReference = BC2381361BB462180060CC80 /* BitreserveSdkTests.xctest */; + name = UpholdSdkTests; + productName = UpholdSdkTests; + productReference = BC2381361BB462180060CC80 /* UpholdSdkTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -379,7 +374,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0700; - ORGANIZATIONNAME = Bitreserve; + ORGANIZATIONNAME = Uphold; TargetAttributes = { BC23812B1BB462170060CC80 = { CreatedOnToolsVersion = 7.0; @@ -389,7 +384,7 @@ }; }; }; - buildConfigurationList = BC2381261BB462170060CC80 /* Build configuration list for PBXProject "BitreserveSdk" */; + buildConfigurationList = BC2381261BB462170060CC80 /* Build configuration list for PBXProject "UpholdSdk" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -411,8 +406,8 @@ ); projectRoot = ""; targets = ( - BC23812B1BB462170060CC80 /* BitreserveSdk */, - BC2381351BB462180060CC80 /* BitreserveSdkTests */, + BC23812B1BB462170060CC80 /* UpholdSdk */, + BC2381351BB462180060CC80 /* UpholdSdkTests */, ); }; /* End PBXProject section */ @@ -509,7 +504,6 @@ files = ( BC2381661BB4626F0060CC80 /* Normalized.swift in Sources */, BC23816F1BB4626F0060CC80 /* InternationalizationUserSetting.swift in Sources */, - BC2381641BB4626F0060CC80 /* Address.swift in Sources */, BC23816E1BB4626F0060CC80 /* Transaction.swift in Sources */, BC2381721BB4626F0060CC80 /* User.swift in Sources */, BC2381741BB4626F0060CC80 /* TickerService.swift in Sources */, @@ -525,7 +519,7 @@ BC23816A1BB4626F0060CC80 /* Destination.swift in Sources */, BC2381761BB4626F0060CC80 /* UserService.swift in Sources */, BC2381711BB4626F0060CC80 /* UserSettings.swift in Sources */, - BC2381621BB4626F0060CC80 /* BitreserveClient.swift in Sources */, + BC2381621BB4626F0060CC80 /* UpholdClient.swift in Sources */, BC2381731BB4626F0060CC80 /* ReserveService.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -548,10 +542,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - BC2381391BB462180060CC80 /* PBXTargetDependency */ = { + BC6BEE231BCEACBA0090656F /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = BC23812B1BB462170060CC80 /* BitreserveSdk */; - targetProxy = BC2381381BB462180060CC80 /* PBXContainerItemProxy */; + target = BC23812B1BB462170060CC80 /* UpholdSdk */; + targetProxy = BC6BEE221BCEACBA0090656F /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -655,8 +649,8 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.bitreserve.bitreservesdk; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.uphold.upholdsdk; + PRODUCT_NAME = UpholdSdk; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 1; }; @@ -672,8 +666,8 @@ INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.bitreserve.bitreservesdk; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.uphold.upholdsdk; + PRODUCT_NAME = UpholdSdk; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 1; }; @@ -684,8 +678,8 @@ buildSettings = { INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.Bitreserve.BitreserveSdkTests; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.uphold.upholdsdktests; + PRODUCT_NAME = UpholdSdkTests; }; name = Debug; }; @@ -694,15 +688,15 @@ buildSettings = { INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.Bitreserve.BitreserveSdkTests; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.uphold.upholdsdktests; + PRODUCT_NAME = UpholdSdkTests; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - BC2381261BB462170060CC80 /* Build configuration list for PBXProject "BitreserveSdk" */ = { + BC2381261BB462170060CC80 /* Build configuration list for PBXProject "UpholdSdk" */ = { isa = XCConfigurationList; buildConfigurations = ( BC23813E1BB462180060CC80 /* Debug */, @@ -711,7 +705,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BC2381401BB462180060CC80 /* Build configuration list for PBXNativeTarget "BitreserveSdk" */ = { + BC2381401BB462180060CC80 /* Build configuration list for PBXNativeTarget "UpholdSdk" */ = { isa = XCConfigurationList; buildConfigurations = ( BC2381411BB462180060CC80 /* Debug */, @@ -720,7 +714,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BC2381431BB462180060CC80 /* Build configuration list for PBXNativeTarget "BitreserveSdkTests" */ = { + BC2381431BB462180060CC80 /* Build configuration list for PBXNativeTarget "UpholdSdkTests" */ = { isa = XCConfigurationList; buildConfigurations = ( BC2381441BB462180060CC80 /* Debug */, diff --git a/BitreserveSdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/UpholdSdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 68% rename from BitreserveSdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to UpholdSdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata index cee9488..f6203dd 100644 --- a/BitreserveSdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/UpholdSdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:UpholdSdk.xcodeproj"> diff --git a/BitreserveSdk.xcodeproj/xcshareddata/xcschemes/BitreserveSdk.xcscheme b/UpholdSdk.xcodeproj/xcshareddata/xcschemes/UpholdSdk.xcscheme similarity index 76% rename from BitreserveSdk.xcodeproj/xcshareddata/xcschemes/BitreserveSdk.xcscheme rename to UpholdSdk.xcodeproj/xcshareddata/xcschemes/UpholdSdk.xcscheme index eb4f997..551f877 100644 --- a/BitreserveSdk.xcodeproj/xcshareddata/xcschemes/BitreserveSdk.xcscheme +++ b/UpholdSdk.xcodeproj/xcshareddata/xcschemes/UpholdSdk.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "UpholdSdk.framework" + BlueprintName = "UpholdSdk" + ReferencedContainer = "container:UpholdSdk.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "UpholdSdk.xctest" + BlueprintName = "UpholdSdkTests" + ReferencedContainer = "container:UpholdSdk.xcodeproj"> @@ -43,9 +43,9 @@ + BuildableName = "UpholdSdk.framework" + BlueprintName = "UpholdSdk" + ReferencedContainer = "container:UpholdSdk.xcodeproj"> @@ -65,9 +65,9 @@ + BuildableName = "UpholdSdk.framework" + BlueprintName = "UpholdSdk" + ReferencedContainer = "container:UpholdSdk.xcodeproj"> @@ -83,9 +83,9 @@ + BuildableName = "UpholdSdk.framework" + BlueprintName = "UpholdSdk" + ReferencedContainer = "container:UpholdSdk.xcodeproj">