Skip to content

Commit

Permalink
Merge pull request #79 from hyperledger/feature/podspec
Browse files Browse the repository at this point in the history
Podspec
  • Loading branch information
unklayman authored Jan 24, 2019
2 parents bd4f70e + 0e8cd0e commit 982005d
Show file tree
Hide file tree
Showing 21 changed files with 46 additions and 38 deletions.
8 changes: 4 additions & 4 deletions Example/IrohaCommunication.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,9 @@
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-IntegrationTestHost/Pods-IntegrationTestHost-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework",
"${BUILT_PRODUCTS_DIR}/IrohaCommunication/IrohaCommunication.framework",
"${BUILT_PRODUCTS_DIR}/IrohaCrypto/IrohaCrypto.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyIroha/SwiftyIroha.framework",
"${BUILT_PRODUCTS_DIR}/gRPC/GRPCClient.framework",
"${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework",
"${BUILT_PRODUCTS_DIR}/gRPC-ProtoRPC/ProtoRPC.framework",
Expand All @@ -693,9 +693,9 @@
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IrohaCommunication.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IrohaCrypto.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyIroha.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRPCClient.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ProtoRPC.framework",
Expand All @@ -717,9 +717,9 @@
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-IrohaExample/Pods-IrohaExample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework",
"${BUILT_PRODUCTS_DIR}/IrohaCommunication/IrohaCommunication.framework",
"${BUILT_PRODUCTS_DIR}/IrohaCrypto/IrohaCrypto.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyIroha/SwiftyIroha.framework",
"${BUILT_PRODUCTS_DIR}/gRPC/GRPCClient.framework",
"${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework",
"${BUILT_PRODUCTS_DIR}/gRPC-ProtoRPC/ProtoRPC.framework",
Expand All @@ -731,9 +731,9 @@
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IrohaCommunication.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IrohaCrypto.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyIroha.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRPCClient.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ProtoRPC.framework",
Expand Down
2 changes: 1 addition & 1 deletion Example/IrohaExample/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import UIKit
import SwiftyIroha;
import IrohaCommunication;
import IrohaCrypto;

class ViewController: UIViewController {
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use_frameworks!

target 'IrohaExample' do
pod 'SwiftyIroha', :path => '../'
pod 'IrohaCommunication', :path => '../'
end

target 'IntegrationTestHost' do
pod 'SwiftyIroha', :path => '../'
pod 'IrohaCommunication', :path => '../'

target 'UnitTests' do
inherit! :search_paths
Expand Down
20 changes: 10 additions & 10 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ PODS:
- gRPC/Main (1.11.0):
- gRPC-Core (= 1.11.0)
- gRPC-RxLibrary (= 1.11.0)
- IrohaCommunication (0.1.0):
- BoringSSL (= 10.0.3)
- gRPC-ProtoRPC (= 1.11.0)
- IrohaCrypto
- nanopb (= 0.3.8)
- Protobuf (~> 3.5.0)
- IrohaCrypto (0.2.5)
- nanopb (0.3.8):
- nanopb/decode (= 0.3.8)
- nanopb/encode (= 0.3.8)
- nanopb/decode (0.3.8)
- nanopb/encode (0.3.8)
- Protobuf (3.5.0)
- SwiftyIroha (0.1.0-rc2):
- BoringSSL (= 10.0.3)
- gRPC-ProtoRPC (= 1.11.0)
- IrohaCrypto
- nanopb (= 0.3.8)
- Protobuf (~> 3.5.0)

DEPENDENCIES:
- SwiftyIroha (from `../`)
- IrohaCommunication (from `../`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
Expand All @@ -53,7 +53,7 @@ SPEC REPOS:
- Protobuf

EXTERNAL SOURCES:
SwiftyIroha:
IrohaCommunication:
:path: "../"

SPEC CHECKSUMS:
Expand All @@ -62,11 +62,11 @@ SPEC CHECKSUMS:
gRPC-Core: 164639cd8ae18ca8b65477fafb2efbaecf4f181a
gRPC-ProtoRPC: bb5fddf3424aa4fad74d76736578a79fe40e244e
gRPC-RxLibrary: 26d53d1b1f306befd4ad4e15bd6de27839a82481
IrohaCommunication: e40a8540f7fd1c4e81765fbfa12dc7291a070dcb
IrohaCrypto: d0e6e1189ce43a51b6f7916f4830605c7d466d57
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03
SwiftyIroha: dabcf81e33d9cce5b87cd438e2026cd96c18b784

PODFILE CHECKSUM: 9644665bf10c3fd12336940a2087d327330159c9
PODFILE CHECKSUM: 29089a97c3781ec366ef8266addf4289525ff849

COCOAPODS: 1.5.3
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;
@import IrohaCrypto;

@interface IRBaseIrohaContainerTests : XCTestCase
Expand Down
2 changes: 1 addition & 1 deletion IntegrationTests/IrohaContainer/IRIrohaContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

#import <Foundation/Foundation.h>
@import SwiftyIroha;
@import IrohaCommunication;

@interface IRIrohaContainer : NSObject

Expand Down
16 changes: 12 additions & 4 deletions SwiftyIroha.podspec → IrohaCommunication.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
#
# Be sure to run `pod lib lint IrohaCommunication.podspec' to ensure this is a
# valid spec before submitting.
#
# Any lines starting with a # are optional, but their use is encouraged
# To learn more about a Podspec see https://guides.cocoapods.org/syntax/podspec.html
#

Pod::Spec.new do |s|
s.name = 'SwiftyIroha'
s.version = '0.1.0-rc2'
s.name = 'IrohaCommunication'
s.version = '0.1.0'
s.summary = 'Helper classes to use for communication with Iroha blockchain.'

s.homepage = 'https://github.com/soramitsu/iroha-ios'
s.homepage = 'https://github.com/hyperledger/iroha-ios'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'Russel' => '[email protected]' }
s.source = { :git => 'https://github.com/soramitsu/iroha-ios.git', :tag => s.version.to_s }
s.source = { :git => 'https://github.com/hyperledger/iroha-ios.git', :tag => s.version.to_s }

s.ios.deployment_target = '9.0'

Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRAccountAssetTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static NSString * const VALID_ACCOUNT_IDENTIFIER = @"[email protected]";
static NSString * const VALID_ASSET_IDENTIFIER = @"testcoin#gmail.com";
Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRAccountIdTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static const NSUInteger VALID_ACCOUNT_NAMES_COUNT = 5;
static NSString* const VALID_ACCOUNT_NAMES[] = {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRAddressTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static const NSUInteger VALID_ADDRESSES_COUNT = 4;
static NSString* const VALID_IPV4[] = {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRAmountTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static const NSUInteger VALID_STRING_AMOUNT_COUNT = 4;
static NSString * const VALID_STRING_AMOUNT[] = {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRAssetIdTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static const NSUInteger VALID_ASSET_NAMES_COUNT = 5;
static NSString* const VALID_ASSET_NAMES[] = {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRDomainTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static const NSUInteger VALID_DOMAINS_COUNT = 5;
static NSString * const VALID_DOMAINS[] = {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRGrantablePermissionTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

@interface IRGrantablePermissionTests : XCTestCase

Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRPaginationTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

@interface IRPaginationTests : XCTestCase

Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRRoleNameTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static const NSUInteger VALID_ROLE_NAMES_COUNT = 6;
static NSString* const VALID_ROLE_NAMES[] = {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Model/IRRolePermissionTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

@interface IRRolePermissionTests : XCTestCase

Expand Down
2 changes: 1 addition & 1 deletion Tests/Promise/IRPromiseTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;


@interface IRPromiseTests : XCTestCase
Expand Down
2 changes: 1 addition & 1 deletion Tests/Query/IRBlockQueryBuilderTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static NSString * const VALID_ACCOUNT_IDENTIFIER = @"[email protected]";

Expand Down
2 changes: 1 addition & 1 deletion Tests/Query/IRQueryBuilderTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;

static NSString * const VALID_ACCOUNT_IDENTIFIER = @"[email protected]";
static NSString * const VALID_ASSET_IDENTIFIER = @"testcoin#gmail.com";
Expand Down
4 changes: 2 additions & 2 deletions Tests/Transaction/IRTransactionTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
*/

@import XCTest;
@import SwiftyIroha;
@import IrohaCommunication;
@import IrohaCrypto;

#import "SwiftyIroha/IRTransactionImpl+Proto.h"
#import "IrohaCommunication/IRTransactionImpl+Proto.h"

static NSString * const VALID_ACCOUNT_NAME = @"bob";
static NSString * const VALID_DOMAIN = @"gmail.com";
Expand Down

0 comments on commit 982005d

Please sign in to comment.