diff --git a/Example/IrohaCommunication.xcodeproj/project.pbxproj b/Example/IrohaCommunication.xcodeproj/project.pbxproj index 47a3621ed..488d3d53a 100755 --- a/Example/IrohaCommunication.xcodeproj/project.pbxproj +++ b/Example/IrohaCommunication.xcodeproj/project.pbxproj @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/Example/IrohaExample/ViewController.swift b/Example/IrohaExample/ViewController.swift index f6d608851..9810424fa 100755 --- a/Example/IrohaExample/ViewController.swift +++ b/Example/IrohaExample/ViewController.swift @@ -4,7 +4,7 @@ */ import UIKit -import SwiftyIroha; +import IrohaCommunication; import IrohaCrypto; class ViewController: UIViewController { diff --git a/Example/Podfile b/Example/Podfile index bc8ac5c68..684038bcd 100755 --- a/Example/Podfile +++ b/Example/Podfile @@ -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 diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 4f45b411e..14172ab64 100755 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -24,6 +24,12 @@ 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) @@ -31,15 +37,9 @@ PODS: - 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: @@ -53,7 +53,7 @@ SPEC REPOS: - Protobuf EXTERNAL SOURCES: - SwiftyIroha: + IrohaCommunication: :path: "../" SPEC CHECKSUMS: @@ -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 diff --git a/IntegrationTests/IrohaContainer/IRBaseIrohaContainerTests.h b/IntegrationTests/IrohaContainer/IRBaseIrohaContainerTests.h index 1b56c67f5..1ec48eadc 100755 --- a/IntegrationTests/IrohaContainer/IRBaseIrohaContainerTests.h +++ b/IntegrationTests/IrohaContainer/IRBaseIrohaContainerTests.h @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; @import IrohaCrypto; @interface IRBaseIrohaContainerTests : XCTestCase diff --git a/IntegrationTests/IrohaContainer/IRIrohaContainer.h b/IntegrationTests/IrohaContainer/IRIrohaContainer.h index a5c674b35..e32f48d49 100755 --- a/IntegrationTests/IrohaContainer/IRIrohaContainer.h +++ b/IntegrationTests/IrohaContainer/IRIrohaContainer.h @@ -4,7 +4,7 @@ */ #import -@import SwiftyIroha; +@import IrohaCommunication; @interface IRIrohaContainer : NSObject diff --git a/SwiftyIroha.podspec b/IrohaCommunication.podspec similarity index 64% rename from SwiftyIroha.podspec rename to IrohaCommunication.podspec index 58bf13512..9426fe5d8 100755 --- a/SwiftyIroha.podspec +++ b/IrohaCommunication.podspec @@ -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' => 'emkil.russel@gmail.com' } - 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' diff --git a/Tests/Model/IRAccountAssetTests.m b/Tests/Model/IRAccountAssetTests.m index 10a9cd037..6ec70085a 100755 --- a/Tests/Model/IRAccountAssetTests.m +++ b/Tests/Model/IRAccountAssetTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static NSString * const VALID_ACCOUNT_IDENTIFIER = @"bob@gmail.com"; static NSString * const VALID_ASSET_IDENTIFIER = @"testcoin#gmail.com"; diff --git a/Tests/Model/IRAccountIdTests.m b/Tests/Model/IRAccountIdTests.m index b85e5b0ec..02961fab8 100755 --- a/Tests/Model/IRAccountIdTests.m +++ b/Tests/Model/IRAccountIdTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static const NSUInteger VALID_ACCOUNT_NAMES_COUNT = 5; static NSString* const VALID_ACCOUNT_NAMES[] = { diff --git a/Tests/Model/IRAddressTests.m b/Tests/Model/IRAddressTests.m index 7d4b451be..208694d65 100755 --- a/Tests/Model/IRAddressTests.m +++ b/Tests/Model/IRAddressTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static const NSUInteger VALID_ADDRESSES_COUNT = 4; static NSString* const VALID_IPV4[] = { diff --git a/Tests/Model/IRAmountTests.m b/Tests/Model/IRAmountTests.m index 4df39a076..ddda95c4c 100755 --- a/Tests/Model/IRAmountTests.m +++ b/Tests/Model/IRAmountTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static const NSUInteger VALID_STRING_AMOUNT_COUNT = 4; static NSString * const VALID_STRING_AMOUNT[] = { diff --git a/Tests/Model/IRAssetIdTests.m b/Tests/Model/IRAssetIdTests.m index 05fce20b0..937bc4540 100755 --- a/Tests/Model/IRAssetIdTests.m +++ b/Tests/Model/IRAssetIdTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static const NSUInteger VALID_ASSET_NAMES_COUNT = 5; static NSString* const VALID_ASSET_NAMES[] = { diff --git a/Tests/Model/IRDomainTests.m b/Tests/Model/IRDomainTests.m index 60673fc0c..5c7eefb30 100755 --- a/Tests/Model/IRDomainTests.m +++ b/Tests/Model/IRDomainTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static const NSUInteger VALID_DOMAINS_COUNT = 5; static NSString * const VALID_DOMAINS[] = { diff --git a/Tests/Model/IRGrantablePermissionTests.m b/Tests/Model/IRGrantablePermissionTests.m index e997e0ee8..4dd5d8733 100755 --- a/Tests/Model/IRGrantablePermissionTests.m +++ b/Tests/Model/IRGrantablePermissionTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; @interface IRGrantablePermissionTests : XCTestCase diff --git a/Tests/Model/IRPaginationTests.m b/Tests/Model/IRPaginationTests.m index 6166423b3..e83ccad52 100755 --- a/Tests/Model/IRPaginationTests.m +++ b/Tests/Model/IRPaginationTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; @interface IRPaginationTests : XCTestCase diff --git a/Tests/Model/IRRoleNameTests.m b/Tests/Model/IRRoleNameTests.m index e4a1a13e2..7c950d8d2 100755 --- a/Tests/Model/IRRoleNameTests.m +++ b/Tests/Model/IRRoleNameTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static const NSUInteger VALID_ROLE_NAMES_COUNT = 6; static NSString* const VALID_ROLE_NAMES[] = { diff --git a/Tests/Model/IRRolePermissionTests.m b/Tests/Model/IRRolePermissionTests.m index 7892b47c6..3d5f411ff 100755 --- a/Tests/Model/IRRolePermissionTests.m +++ b/Tests/Model/IRRolePermissionTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; @interface IRRolePermissionTests : XCTestCase diff --git a/Tests/Promise/IRPromiseTests.m b/Tests/Promise/IRPromiseTests.m index 529e10a23..e1c142e7b 100755 --- a/Tests/Promise/IRPromiseTests.m +++ b/Tests/Promise/IRPromiseTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; @interface IRPromiseTests : XCTestCase diff --git a/Tests/Query/IRBlockQueryBuilderTests.m b/Tests/Query/IRBlockQueryBuilderTests.m index 8be3ee7f0..ec1a7a2d8 100755 --- a/Tests/Query/IRBlockQueryBuilderTests.m +++ b/Tests/Query/IRBlockQueryBuilderTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static NSString * const VALID_ACCOUNT_IDENTIFIER = @"bob@gmail.com"; diff --git a/Tests/Query/IRQueryBuilderTests.m b/Tests/Query/IRQueryBuilderTests.m index e3672aa85..63563736e 100755 --- a/Tests/Query/IRQueryBuilderTests.m +++ b/Tests/Query/IRQueryBuilderTests.m @@ -4,7 +4,7 @@ */ @import XCTest; -@import SwiftyIroha; +@import IrohaCommunication; static NSString * const VALID_ACCOUNT_IDENTIFIER = @"bob@gmail.com"; static NSString * const VALID_ASSET_IDENTIFIER = @"testcoin#gmail.com"; diff --git a/Tests/Transaction/IRTransactionTests.m b/Tests/Transaction/IRTransactionTests.m index ea90d3f28..f258cae8b 100755 --- a/Tests/Transaction/IRTransactionTests.m +++ b/Tests/Transaction/IRTransactionTests.m @@ -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";