Merge pull request 'Android build: Update sequoia to 1.3.0 and get rid of cargo experimental for the build.' (#11) from android-build into Release_2.1

Reviewed-on: https://gitea.pep.foundation/pEp.foundation/pEpJNIAdapter/pulls/11

android/build.gradle

@@ -32,8 +32,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 6
-        versionName "2.1.27"
+        versionCode 7
+        versionName "2.1.29"
 
         externalNativeBuild {
             ndkBuild {

android/external/Makefile.conf

@@ -20,7 +20,7 @@ NETTLE_VERSION=3.7.3
 
 ### Git deps repos
 EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD
-EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.1.0
+EXTERNAL_GIT_REPOS += sequoia|https://gitlab.com/sequoia-pgp/sequoia.git?openpgp/v1.3.0
 
 ### Common variables
 #### Source code targets

android/external/arm64-v8a/Makefile

@@ -314,6 +314,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
 sequoia.src.stamp: ../downloads/sequoia.tar.gz
 	mkdir -p sequoia
 	cd sequoia && tar xvf ../$<
+	cd sequoia && cargo update -p nettle-sys --precise 2.0.8
 	touch $@
 
 sequoia-ffi-clean:
@@ -328,7 +329,7 @@ $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.so:  se
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target aarch64-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target aarch64-linux-android -p sequoia-openpgp-ffi --release
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.so
 	cp $(CARGO_TARGET_DIR)/aarch64-linux-android/release/libsequoia_openpgp_ffi.* $(LOCAL)/lib/

android/external/armeabi-v7a/Makefile

@@ -313,6 +313,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build
 sequoia.src.stamp: ../downloads/sequoia.tar.gz
 	mkdir -p sequoia
 	cd sequoia && tar xvf ../$<
+	cd sequoia && cargo update -p nettle-sys --precise 2.0.8
 	touch $@
 
 sequoia-ffi-clean:
@@ -327,7 +328,7 @@ $(CARGO_TARGET_DIR)/armv7-linux-androideabi/release/libsequoia_openpgp_ffi.so:
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target armv7-linux-androideabi -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target armv7-linux-androideabi -p sequoia-openpgp-ffi --release
 
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/armv7-linux-androideabi/release/libsequoia_openpgp_ffi.so

android/external/x86/Makefile

@@ -222,7 +222,7 @@ $(LOCAL)/lib/libssl.so: openssl/libssl.so
 		cp libcrypto.so $(LOCAL)/lib && \
 		cp libcrypto.a $(LOCAL)/lib && \
 		cp libssl.so $(LOCAL)/lib && \
-		cp libssl.a $(LOCAL)/lib 
+		cp libssl.a $(LOCAL)/lib
 	ls -l $(LOCAL)/lib/libssl.so
 
 openssl-build: openssl/libssl.so
@@ -313,6 +313,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
 sequoia.src.stamp: ../downloads/sequoia.tar.gz
 	mkdir -p sequoia
 	cd sequoia && tar xvf ../$<
+	cd sequoia && cargo update -p nettle-sys --precise 2.0.8
 	touch $@
 
 sequoia-ffi-clean:
@@ -327,7 +328,7 @@ $(CARGO_TARGET_DIR)/i686-linux-android/release/libsequoia_openpgp_ffi.so:  sequo
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target i686-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target i686-linux-android -p sequoia-openpgp-ffi --release
 
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/i686-linux-android/release/libsequoia_openpgp_ffi.so

android/external/x86_64/Makefile

@@ -313,6 +313,7 @@ CARGO_TARGET_DIR=$(EXTERNAL_ROOT)/../build/
 sequoia.src.stamp: ../downloads/sequoia.tar.gz
 	mkdir -p sequoia
 	cd sequoia && tar xvf ../$<
+	cd sequoia && cargo update -p nettle-sys --precise 2.0.8
 	touch $@
 
 sequoia-ffi-clean:
@@ -327,7 +328,7 @@ $(CARGO_TARGET_DIR)/x86_64-linux-android/release/libsequoia_openpgp_ffi.so:  seq
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_LIB_DIR="$(LOCAL)/lib" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_INCLUDE_DIR="$(LOCAL)/include" \
 	ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR="$(LOCAL)/bin" \
-	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) rustup run nightly cargo build --target x86_64-linux-android -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
+	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo build --target x86_64-linux-android -p sequoia-openpgp-ffi --release
 
 
 $(LOCAL)/lib/libsequoia_openpgp_ffi.so: $(CARGO_TARGET_DIR)/x86_64-linux-android/release/libsequoia_openpgp_ffi.so

android/src/foundation/pEp/jniadapter/AndroidHelper.java

@@ -31,7 +31,7 @@ public class AndroidHelper {
         
     // TODO : Increment when needed.
     // TODO : Check if this version tracking is really needed and Automatize it
-    public static String ENGINE_VERSION_CODE = "Release_2.1.33";
+    public static String ENGINE_VERSION_CODE = "Release_2.1.37";
 
     private static File shareDir;