Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update branding #11

Merged
merged 1 commit into from
Oct 14, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
29 changes: 0 additions & 29 deletions BitreserveSdk.podspec.json

This file was deleted.

46 changes: 22 additions & 24 deletions Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand All @@ -40,15 +39,14 @@
BC2381171BB461DE0060CC80 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
BC23811A1BB461DE0060CC80 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
BC23811C1BB461DE0060CC80 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = BitreserveSdk.xcodeproj; sourceTree = "<group>"; };
BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = UpholdSdk.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
BC23810A1BB461DE0060CC80 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
BC2381C91BB465420060CC80 /* BitreserveSdk.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -58,7 +56,7 @@
BC2381041BB461DE0060CC80 = {
isa = PBXGroup;
children = (
BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */,
BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */,
BC23810F1BB461DE0060CC80 /* Example */,
BC23810E1BB461DE0060CC80 /* Products */,
);
Expand All @@ -85,11 +83,11 @@
path = Example;
sourceTree = "<group>";
};
BC2381BF1BB465260060CC80 /* Products */ = {
BC7C7BE71BCE782B00CB0CDD /* Products */ = {
isa = PBXGroup;
children = (
BC2381C61BB465260060CC80 /* BitreserveSdk.framework */,
BC2381C81BB465260060CC80 /* BitreserveSdkTests.xctest */,
BC7C7BEC1BCE782C00CB0CDD /* UpholdSdk.framework */,
BC7C7BEE1BCE782C00CB0CDD /* UpholdSdk.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -121,7 +119,7 @@
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = Bitreserve;
ORGANIZATIONNAME = Uphold;
TargetAttributes = {
BC23810C1BB461DE0060CC80 = {
CreatedOnToolsVersion = 7.0;
Expand All @@ -141,8 +139,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = BC2381BF1BB465260060CC80 /* Products */;
ProjectRef = BC2381BE1BB465260060CC80 /* BitreserveSdk.xcodeproj */;
ProductGroup = BC7C7BE71BCE782B00CB0CDD /* Products */;
ProjectRef = BC2381BE1BB465260060CC80 /* UpholdSdk.xcodeproj */;
},
);
projectRoot = "";
Expand All @@ -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 */
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion Example/ViewController.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UIKit
import BitreserveSdk
import UpholdSdk

class ViewController: UIViewController {
}
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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`.
Expand All @@ -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`.
Original file line number Diff line number Diff line change
@@ -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")
}

}
8 changes: 4 additions & 4 deletions Source/Service/ReserveService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

/**
Expand All @@ -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))
}

/**
Expand All @@ -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)
}

/**
Expand All @@ -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")
}

}
4 changes: 2 additions & 2 deletions Source/Service/TickerService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

/**
Expand All @@ -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))
}

}
16 changes: 8 additions & 8 deletions Source/Service/UserCardService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

/**
Expand All @@ -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)
}

/**
Expand All @@ -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)
}

/**
Expand All @@ -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)
}

/**
Expand All @@ -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))
}

/**
Expand All @@ -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")
}

/**
Expand All @@ -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)
}

/**
Expand All @@ -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)
}

}
Loading