Merge pull request #123 from ERussel/fix/dependencies

Fix/dependencies

IrohaCommunication.podspec

@@ -8,11 +8,11 @@
 
 Pod::Spec.new do |s|
   s.name             = 'IrohaCommunication'
-  s.version          = '4.0.0'
+  s.version          = '4.0.1'
   s.summary          = 'Helper classes to use for communication with Iroha blockchain.'
 
   s.homepage         = 'https://github.com/hyperledger/iroha-ios'
-  s.license          = { :type => 'MIT', :file => 'LICENSE' }
+  s.license          = { :type => 'Apache-2.0', :file => 'LICENSE' }
   s.author           = { 'Russel' => '[email protected]' }
   s.source           = { :git => 'https://github.com/hyperledger/iroha-ios.git', :tag => s.version.to_s }
 
@@ -25,10 +25,10 @@ Pod::Spec.new do |s|
   s.preserve_paths = 'ProtoGen/*.{h,m}'
 
   s.dependency 'IrohaCrypto/Iroha', '~> 0.3.0'
-  s.dependency 'gRPC-ProtoRPC', '= 1.11.0'
+  s.dependency 'gRPC-ProtoRPC', '~> 1.11.0'
   s.dependency 'Protobuf', '~> 3.5.0'
-  s.dependency 'BoringSSL', '= 10.0.3'
-  s.dependency 'nanopb', '= 0.3.8'
+  s.dependency 'BoringSSL', '~> 10.0.3'
+  s.dependency 'nanopb', '~> 0.3.8'
 
   s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' }
 

Jenkinsfile

@@ -1,42 +1,4 @@
-node('mac_for_ios') {
-  scmVars = checkout scm
-  try {
-    grpc = "protoc-gen-objcgrpc"
-    withEnv(['IROHA_PATH=iroha',
-            'SCHEMA_PATH=Schema',
-            'PROTO_GEN=ProtoGen',
-            'LANG=en_US.UTF-8']) {
-      stage('prepare') {
-        if (scmVars.GIT_LOCAL_BRANCH == 'master' || env.CHANGE_TARGET == 'master' ) {
-          sh(script: "git clone -b master --depth=1 https://github.com/hyperledger/iroha")
-          sh(script: "mkdir \$SCHEMA_PATH")
-          sh(script: "cp -R \$IROHA_PATH/shared_model/schema \$SCHEMA_PATH/proto")
-          sh(script: "mkdir \$PROTO_GEN-iroha")
-          sh(script: "protoc --plugin=protoc-gen-grpc=\$(command -v ${grpc}) --objc_out=\$PROTO_GEN-iroha --grpc_out=\$PROTO_GEN-iroha --proto_path=./\$SCHEMA_PATH/proto ./\$SCHEMA_PATH/proto/*.proto")
-          difference = sh(script: "diff -r \$PROTO_GEN-iroha \$PROTO_GEN | grep \$PROTO_GEN-iroha | awk '{print \$4}'", returnStdout: true)
-          if (difference.length() > 0) {
-            echo "Differences in protofiles:\n ${difference}"
-            currentBuild.result = 'UNSTABLE'
-          }
-        }
-      }
-      stage('test') {
-        sh(script: "pod lib lint --verbose --allow-warnings")
-      }
-      stage('release') {
-        checkTag = sh(script: 'git describe --tags --exact-match ${GIT_COMMIT}', returnStatus: true)
-        if (scmVars.GIT_LOCAL_BRANCH == 'master' && checkTag == 0 && currentBuild.result == 'SUCCESS') {
-          sh(script: "pod trunk push")
-        }
-      }
-    }
-  } // end try
-  catch(Exception e) {
-    currentBuild.result = 'FAILURE'
-  } // end catch
-  finally {
-    cleanWs()
-  }
-} //end node
-
+@Library('jenkins-library' ) _
 
+def appPipline = new org.ios.AppPipeline(steps: this, libEnable: true, appEnable: false, libAllowWarnings:true)
+appPipline.runPipeline()

LICENSE

@@ -3,4 +3,4 @@ Copyright 2018 Soramitsu Co., Ltd.
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

SECURITY.md

@@ -9,4 +9,3 @@ There are two ways to report a security bug. The easiest is to email a descripti
 The other way is to file a confidential security bug in our [JIRA bug tracking system](https://jira.hyperledger.org). Be sure to set the “Security Level” to “Security issue”.
 
 The process by which the Hyperledger Security Team handles security bugs is documented further in our [Defect Response page](https://wiki.hyperledger.org/display/HYP/Defect+Response) on our [wiki](https://wiki.hyperledger.org).
-