resolved merge conflicts

Signed-off-by: Michael Boyd <[email protected]>

Author: michaeldboyd

.gitignore

@@ -9,11 +9,9 @@ package-lock.json
 .cache
 .DS_Store
 Podfile.lock
-.vscode/
-_build/
+.vscode
+.pytest_cache
 
 /wrappers/python/venv/
-
-
-
-
+.vscode
+_build/

Jenkinsfile.cd

@@ -481,14 +481,13 @@ def linuxVcxJavaTesting(env_name, network_name, testEnv, stashBuildResults) {
 def linuxVcxPythonTesting(env_name, network_name, testEnv, stashBuildResults) {
     unstash name: "VcxPythonLibvcxSO${env_name}"
     unstash name: "VcxPythonLibindyAndLibnullpaySO${env_name}"
+    
     dir('vcx/wrappers/python3') {
-
-
         testEnv.inside {
             echo "${env_name} Vcx Test: Test python wrapper"
 
             sh '''
-                    python3.5 -m pip install --user pytest==3.4.2 qrcode pytest-asyncio
+                    python3.5 -m pip install --user pytest==3.6.4 pytest-asyncio
                     LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} python3.5 -m pytest -s
             '''
         }
@@ -1025,6 +1024,10 @@ def libvcxDebPublishing(testEnv) {
 
     def libvcxVersion = getSrcVersion("vcx/libvcx")
 
+    def libindyVersion = getSrcVersion("libindy")
+    def replaceVersion = "$libindyVersion~$env.BUILD_NUMBER"
+    sh "sed -i -e \"s/^\\(Depends: .*libindy\\)\\(\\s*[,]\\{,1\\}.*\\)/\\1 (= $replaceVersion)\\2/\" vcx/libvcx/debian/control"
+
     debPublishing(testEnv, "vcx/libvcx", "libvcx", libvcxVersion, "LibvcxUbuntuBuildResult", "libvcxDebs")
 }
 
@@ -1093,7 +1096,7 @@ def javaWrapperPublishing(testEnv, isRelease) {
 
             sh "sed -i -E -e 'H;1h;\$!d;x' -e \"s/<version>([0-9,.]+)</<version>\\1$suffix</\" pom.xml"
 
-            withCredentials([file(credentialsId: 'artifactory-evernym-settings', variable: 'settingsFile')]) {
+            withCredentials([file(credentialsId: 'maven-settings', variable: 'settingsFile')]) {
                 sh 'cp $settingsFile .'
 
                 sh "mvn clean deploy -DskipTests --settings settings.xml"
@@ -1110,7 +1113,7 @@ def vcxJavaWrapperPublishing(testEnv, isRelease) {
 
         testEnv.inside {
             echo "Publish To Maven Test: Test"
-            withCredentials([file(credentialsId: 'artifactory-evernym-settings', variable: 'settingsFile')]) {
+            withCredentials([file(credentialsId: 'maven-settings', variable: 'settingsFile')]) {
                 sh 'cp $settingsFile .'
 
                 sh "ci/buildJar.sh ${version}${suffix}"
@@ -1291,6 +1294,11 @@ def publishLibnullpayDebRCtoStable(testEnv) {
 
 def publishLibvcxDebRCtoStable(testEnv) {
     def libvcxVersion = getSrcVersion("vcx/libvcx")
+    def libindyVersion = getSrcVersion("libindy")
+    def rcFullVersion = "$libvcxVersion~$env.BUILD_NUMBER"
+
+    sh "fpm -s deb -t deb --version $rcFullVersion --no-auto-depends --depends 'libindy = $libindyVersion' -f -p vcx/libvcx/debs vcx/libvcx/debs/libvcx_\"$rcFullVersion\"_amd64.deb"
+
     publishDebRCtoStable(testEnv, "libvcx", "vcx/libvcx", libvcxVersion, "libvcxDebs", false)
 }
 

Jenkinsfile.ci

@@ -114,11 +114,6 @@ def windowsTesting() {
                     dir('vcx/libvcx') {
                         echo "Windows Libvcx Test: Build"
 
-                        // FIXME remove that once https://jira.hyperledger.org/browse/IS-1127 is resolved
-                        bat """
-                            PowerShell.exe "&{(Get-Content -Path src/settings.rs -Raw) -replace '/tmp/test_init.json','./test_init.json'} | Set-Content -Path src/settings.rs"
-                        """
-
                         withEnv([
                                 "OPENSSL_DIR=$WORKSPACE\\libindy\\prebuilt",
                                 "RUST_BACKTRACE=1"
@@ -622,7 +617,7 @@ def linuxVcxPythonTesting(env_name, network_name, testEnv) {
             echo "${env_name} Vcx Test: Test python wrapper"
 
             sh '''
-                    python3.5 -m pip install --user pytest==3.4.2 qrcode pytest-asyncio
+                    python3.5 -m pip install --user pytest==3.6.4 pytest-asyncio
                     LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} python3.5 -m pytest -s
             '''
         }

README.md

@@ -32,7 +32,7 @@ rewritten but still contains some useful ideas.
 
 The major artifact of the SDK is a C-callable library that provides the basic building blocks for 
 the creation of applications on the top of [Hyperledger Indy](https://www.hyperledger.org/projects/hyperledger-indy).
-It is available for most popular desktop, mobile and server platfrorms.
+It is available for most popular desktop, mobile and server platforms.
 
 ### Libindy wrappers
 

ci/indy-pool.dockerfile

@@ -24,9 +24,9 @@ RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sourc
 
 RUN useradd -ms /bin/bash -u $uid indy
 
-ARG indy_plenum_ver=1.6.641
+ARG indy_plenum_ver=1.6.656
 ARG indy_anoncreds_ver=1.0.32
-ARG indy_node_ver=1.6.740
+ARG indy_node_ver=1.6.761
 ARG python3_indy_crypto_ver=0.4.5
 ARG indy_crypto_ver=0.4.5