Merge pull request #1101 from jovfer/feature/rc_1_6_4

RC 1.6.4

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.6.4
+* Early API types checks
+* Workaround for OS permissions on Android
+* Fix Android build ARMv7
+
 ## 1.6.3
 * Performed the following changes related to Libindy Wallet API:
     * Added separate API function `indy_generate_wallet_key` to generate a random wallet master key.

Specs/libindy-objc/1.6.2/libindy-objc.podspec.json → Specs/libindy-objc/1.6.4/libindy-objc.podspec.json

@@ -1,6 +1,6 @@
 {
     "name": "libindy-objc",
-    "version": "1.6.2",
+    "version": "1.6.4",
     "summary": "Summary TODO.",
     "homepage": "TODO",
     "license": {
@@ -11,7 +11,7 @@
         "Daniel Hardman": "[email protected]"
     },
     "source": {
-        "http": "https://repo.sovrin.org/ios/libindy/stable/indy-objc/1.6.2/libindy-objc.zip"
+        "http": "https://repo.sovrin.org/ios/libindy/stable/indy-objc/1.6.4/libindy-objc.zip"
     },
     "platforms": {
         "ios": "10.0"

Specs/libindy/1.6.4/libindy.podspec.json

@@ -0,0 +1,23 @@
+{
+  "name": "libindy",
+  "version": "1.6.4",
+  "summary": "Summary TODO.",
+  "description": "Description TODO.",
+  "homepage": "TODO",
+  "license": {
+    "type": "Apache License 2.0",
+    "file": "LICENSE"
+  },
+  "authors": {
+    "Daniel Hardman": "[email protected]"
+  },
+  "platforms": {
+    "ios": "10.0"
+  },
+  "source": {
+    "http": "https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.4/libindy.tar.gz"
+  },
+  "source_files": "*.h",
+  "vendored_libraries": "*.a",
+  "requires_arc": false
+}

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "indy-cli"
-version = "1.6.3"
+version = "1.6.4"
 authors = ["Vyacheslav Gudkov <[email protected]>"]
 
 [features]

cli/debian/changelog

@@ -1,4 +1,4 @@
-indy-cli (1.6.3) unstable; urgency=medium
+indy-cli (1.6.4) unstable; urgency=medium
 
   [ Hyperledger ]
   * Created Indy-Cli

libindy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "indy"
-version = "1.6.3"
+version = "1.6.4"
 authors = [
   "Sergej Pupykin <[email protected]>",
   "Vyacheslav Gudkov <[email protected]>",

libindy/android.build.sh

@@ -51,38 +51,38 @@ setup_dependencies(){
         else
             echo "${BLUE}Not downloading prebuilt dependencies. Dependencies locations have to be passed${RESET}"
             if [ -z "${OPENSSL_DIR}" ]; then
-                OPENSSL_DIR="openssl_${TARGET_ARCH}"
+                OPENSSL_DIR="openssl_${ABSOLUTE_ARCH}"
                 if [ -d "${OPENSSL_DIR}" ] ; then
                     echo "${GREEN}Found ${OPENSSL_DIR}${RESET}"
                 elif [ -z "$2" ]; then
                     echo STDERR "${RED}Missing OPENSSL_DIR argument and environment variable${RESET}"
-                    echo STDERR "${BLUE}e.g. set OPENSSL_DIR=<path> for environment or openssl_${TARGET_ARCH}${RESET}"
+                    echo STDERR "${BLUE}e.g. set OPENSSL_DIR=<path> for environment or openssl_${ABSOLUTE_ARCH}${RESET}"
                     exit 1
                 else
                     OPENSSL_DIR=$2
                 fi
             fi
 
             if [ -z "${SODIUM_DIR}" ]; then
-                SODIUM_DIR="libsodium_${TARGET_ARCH}"
+                SODIUM_DIR="libsodium_${ABSOLUTE_ARCH}"
                 if [ -d "${SODIUM_DIR}" ] ; then
                     echo "${GREEN}Found ${SODIUM_DIR}${RESET}"
                 elif [ -z "$3" ]; then
                     echo STDERR "${RED}Missing SODIUM_DIR argument and environment variable${RESET}"
-                    echo STDERR "${BLUE}e.g. set SODIUM_DIR=<path> for environment or libsodium_${TARGET_ARCH}${RESET}"
+                    echo STDERR "${BLUE}e.g. set SODIUM_DIR=<path> for environment or libsodium_${ABSOLUTE_ARCH}${RESET}"
                     exit 1
                 else
                     SODIUM_DIR=$3
                 fi
             fi
 
             if [ -z "${LIBZMQ_DIR}" ] ; then
-                LIBZMQ_DIR="libzmq_${TARGET_ARCH}"
+                LIBZMQ_DIR="libzmq_${ABSOLUTE_ARCH}"
                 if [ -d "${LIBZMQ_DIR}" ] ; then
                     echo "${GREEN}Found ${LIBZMQ_DIR}${RESET}"
                 elif [ -z "$4" ] ; then
                     echo STDERR "${RED}Missing LIBZMQ_DIR argument and environment variable${RESET}"
-                    echo STDERR "${BLUE}e.g. set LIBZMQ_DIR=<path> for environment or libzmq_${TARGET_ARCH}${RESET}"
+                    echo STDERR "${BLUE}e.g. set LIBZMQ_DIR=<path> for environment or libzmq_${ABSOLUTE_ARCH}${RESET}"
                     exit 1
                 else
                     LIBZMQ_DIR=$4
@@ -129,7 +129,7 @@ package_library(){
             zip -r libindy_android_${ABSOLUTE_ARCH}.zip libindy_${ABSOLUTE_ARCH} &&
             echo "${BLUE}Zip file available at ${PWD}/libindy_android_${ABSOLUTE_ARCH}.zip ${RESET}"
         else
-            zip -r libindy_android_${ABSOLUTE_ARCH}_${LIBINDY_VERSION}.zip libindy_${TARGET_ARCH} &&
+            zip -r libindy_android_${ABSOLUTE_ARCH}_${LIBINDY_VERSION}.zip libindy_${ABSOLUTE_ARCH} &&
             echo "${BLUE}Zip file available at ${PWD}/libindy_android_${ABSOLUTE_ARCH}_${LIBINDY_VERSION}.zip ${RESET}"
         fi
 

libindy/ci/setup.android.env.sh

@@ -57,12 +57,12 @@ create_avd(){
 
         echo "no" |
              avdmanager create avd \
-                --name ${TARGET_ARCH} \
+                --name ${ABSOLUTE_ARCH} \
                 --package "system-images;android-24;default;${ABI}" \
                 -f \
                 -c 1000M
 
-        ANDROID_SDK_ROOT=${ANDROID_SDK} ANDROID_HOME=${ANDROID_SDK} ${ANDROID_HOME}/tools/emulator -avd ${TARGET_ARCH} -no-audio -no-window &
+        ANDROID_SDK_ROOT=${ANDROID_SDK} ANDROID_HOME=${ANDROID_SDK} ${ANDROID_HOME}/tools/emulator -avd ${ABSOLUTE_ARCH} -no-audio -no-window &
 }
 
 download_sdk(){
@@ -162,6 +162,7 @@ create_standalone_toolchain_and_rust_target(){
     --arch ${TARGET_ARCH} \
     --api ${TARGET_API} \
     --stl=gnustl \
+    --force \
     --install-dir ${TOOLCHAIN_DIR}
 
     # add rust target

libindy/debian/changelog

@@ -1,12 +1,8 @@
-libindy (1.6.3) unstable; urgency=medium
+libindy (1.6.4) unstable; urgency=medium
 
 [ Hyperledger ]
 
-* 1.6.3
-    * Performed the following changes related to Libindy Wallet API:
-        * Added separate API function `indy_generate_wallet_key` to generate a random wallet master key.
-        * Updated `key_derivation_method` parameter of wallet `credentials` to accept the addition type - `RAW`.
-          By using this type, the result of `indy_generate_wallet_key` can be passed as a wallet master key (key derivation will be skipped).
-        * Updated Indy CLI wallet related commands to accept the addition parameter `key_derivation_method`.
-    * Updated `data` parameter of `indy_build_node_request` API function to accept `blskey_pop` (Proof of possession for BLS key).
-    * Bugfixes
+* 1.6.4
+    * Early API types checks
+    * Workaround for OS permissions on Android
+    * Fix Android build ARMv7