Update for v0.3.0

Author: astonbitecode

.travis.yml

@@ -0,0 +1,35 @@
+dist: trusty
+language: android
+
+jdk:
+  - oraclejdk8
+addons:
+  apt:
+    packages:
+    - oracle-java8-installer
+android:
+  components:
+    - platform-tools
+    - tools
+    - build-tools-26.0.2
+    - android-16
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq gcc-arm-linux-androideabi
+  - sh rust-build/pre_build_rust_keylock_android.sh
+  - sh rust-build/build_rust_for_rust_keylock_android.sh
+
+script:
+  - mvn -f java/pom.xml clean install
+
+deploy:
+  provider: releases
+  api_key:
+    secure: QAFSbUoyNv/1/lkSzS4SBXwozKkk3Hnjlio6aH6akEniFBhkG93+8SUHLFl/O7MR74IpCG4iIm+E7Lo8sZR/xkk5SJgvw2ts4se06b5QmSy0AFjdWuaPJvJpF3WCnOmNiOa/MNBQdnQGoBHDtkmiZM/k4TX4sZfOKN5JEzItt9rSF23koAdnGvwwiaihjIcA1kOLFcGYmzNQF3qwBsnwwhsTHINGwvXcpbLWF6/3pYWXcnPDL/h2Vb+iTg+fG4KBHLK3l7jXarJmqy2uOHs6Nabz1e0KDEoWrUH1GXKzPBfxyXpTXhwIek7iI95QF/eiFgsHlYuX0fAwSRqs5zVEwmx+vmoi5GwaTId1DeY82yn6jl+a5fPFRFVz6DRBQwIu6GgQnMHuijnDrNGim4jrYmDaKHSA+9eK9luXZsXFCxHwTAHRdeWWebK0CdHDr+r3BP9kCzHxmOopwvxt/x3/AZwEAPlNPfLKVFdnKSx7J71lUkiJIjxDOnijWBhmFeOgb7VlHc2Fhg9EZ+/+DD0g+o6IfVqvdBSInD39ynnU8KJVJDWyykyjK45hmZDRCNdN3ns2pSTU7KPS5orTtAOMKs0VPh66/S9aP2TO0W2IUtaY3oyg83g8hCr+BIamyLhA1QQDdlHd7wgy2sNdmt+vVi/KEHGxSw2f/3U3y2XmQMY=
+
+  file: java/target/rust-keylock-android-0.3.0.apk
+  skip_cleanup: true
+  on:
+    repo: rust-keylock/rust-keylock-android
+    tags: true

java/.gitignore

@@ -10,3 +10,4 @@
 /target/
 /libs/armeabi/
 /rust-keylock-android-java.iml
+/libs/

java/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.astonbitecode.rustkeylock"
     android:versionCode="1"
-    android:versionName="0.2.2" >
+    android:versionName="0.3.0" >
 
     <uses-sdk
         android:minSdkVersion="16"

java/pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.astonbitecode.rustkeylock</groupId>
 	<artifactId>rust-keylock-android</artifactId>
-	<version>0.2.1</version>
+	<version>0.3.0</version>
 	<packaging>apk</packaging>
 
 	<name>rust-keylock-android</name>

rust-build/build_rust_for_rust_keylock_android.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 BASEDIR=$(dirname "$0")
 cd $BASEDIR/../
 BASEDIR=`pwd`
@@ -8,14 +10,16 @@ echo Entered Base directory $BASEDIR
 # Add cargo to the path
 CARGO_HOME=$BASEDIR/tools/.cargo
 RUSTUP_HOME=$BASEDIR/tools/.rustup
-PATH=$PATH:$CARGO_HOME/bin
+PATH=$CARGO_HOME/bin:$PATH
 
 ANDROID_RUST="$BASEDIR/rust"
 ANDROID_RUST_KEYLOCK_LIB="$ANDROID_RUST/target/arm-linux-androideabi/release/librustkeylockandroid.so"
 ANDROID_JAVA_NATIVE="$BASEDIR/java/libs/armeabi/"
+
 mkdir -p $ANDROID_JAVA_NATIVE
 cd $ANDROID_RUST
-xargo build --target=arm-linux-androideabi --release
+
+$CARGO_HOME/bin/xargo build --target=arm-linux-androideabi --release
 
 echo "Copying $ANDROID_RUST_KEYLOCK_LIB to $ANDROID_JAVA_NATIVE"
 cp $ANDROID_RUST_KEYLOCK_LIB $ANDROID_JAVA_NATIVE

rust-build/pre_build_rust_keylock_android.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 BASEDIR=$(dirname "$0")
 cd $BASEDIR/../
 BASEDIR=`pwd`
@@ -12,17 +14,39 @@ CARGO_HOME=$BASEDIR/tools/.cargo
 RUSTUP_HOME=$BASEDIR/tools/.rustup
 
 # Install the latest rust stable and cargo
-`curl https://sh.rustup.rs -sSf | CARGO_HOME=$BASEDIR/tools/.cargo RUSTUP_HOME=$BASEDIR/tools/.rustup sh -s -- -y`
-PATH=$PATH:$CARGO_HOME/bin
+PATH=$CARGO_HOME/bin:$PATH
+
+curl https://sh.rustup.rs -sSf > tools/rustup.sh
+chmod +x tools/rustup.sh
 
-rustup default stable
-rustup target add arm-linux-androideabi
+CARGO_HOME=$BASEDIR/tools/.cargo RUSTUP_HOME=$BASEDIR/tools/.rustup sh tools/rustup.sh --no-modify-path -y
+
+$CARGO_HOME/bin/rustup default stable
+$CARGO_HOME/bin/rustup target add arm-linux-androideabi
 
 # Install xargo
-cargo install xargo --force
+$CARGO_HOME/bin/cargo install xargo --force --root $CARGO_HOME
 
 # Create an Android toolchain
 cd $BASEDIR
+
+# Get the appropriate env variable in order to create the needed toolchain
+
+if [ -n "${ANDROID_NDK}" ]; then
+	echo "Found a pre-installed NDK in ${ANDROID_NDK}"
+else
+	# If the NDK does not exist, download it
+	echo "Did not find a pre-installed NDK... Downloading one"
+	curl -L http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O
+	chmod u+x android-ndk-r10e-linux-x86_64.bin
+	./android-ndk-r10e-linux-x86_64.bin > /dev/null
+	rm android-ndk-r10e-linux-x86_64.bin
+	ANDROID_NDK=`pwd`/android-ndk-r10e
+	PATH=$PATH:${ANDROID_NDK}
+fi
+
+ANDROID_NDK_HOME=${ANDROID_NDK}
+
 sh $ANDROID_NDK/build/tools/make-standalone-toolchain.sh --platform=android-16 --arch=arm --install-dir=android-toolchain
 cd android-toolchain
 ANDROID_TOOLCHAIN_DIR=`pwd`
@@ -34,7 +58,7 @@ mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file -Dfile=${BA
 
 # Go to the .cargo directory
 cd $BASEDIR/rust
-mkdir .cargo
+mkdir -p .cargo
 cd .cargo
 CURR_DIR=`pwd`
 echo Entered directory $CURR_DIR

rust/.gitignore

@@ -4,3 +4,4 @@ Cargo.lock
 /.settings/
 /config
 /rust-keylock-android-rust.iml
+/.cargo/

rust/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "rustkeylockandroid"
-version = "0.2.2"
+version = "0.3.0"
 authors = ["aston <[email protected]>"]
 
 [lib]
 name = "rustkeylockandroid"
 crate-type = ["cdylib"]
 
 [dependencies]
-rust_keylock = { git = "https://github.com/rust-keylock/rust-keylock-lib", rev = "HEAD" }
+rust_keylock = "0.3.0"
 libc = "0.2"
 lazy_static = "0.2"
 log = "0.3"