* Version 0.2.2

* Upgrade some dependencies
* Use the git for rust-keylock-lib dependency
* Some housekeeping

Author: astonbitecode

.gitignore

@@ -1,3 +1,5 @@
 /.project
 /.README.md.html
 /buildallandrun.sh
+/android-toolchain/
+/tools/

java/.gitignore

@@ -8,4 +8,5 @@
 /proguard-project.txt
 /project.properties
 /target/
-/libs/armeabi/
+/libs/armeabi/
+/rust-keylock-android-java.iml

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.1" >
+    android:versionName="0.2.2" >
 
     <uses-sdk
         android:minSdkVersion="16"

java/pom.xml

@@ -14,7 +14,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<android.version></android.version>
 		<jna.version>4.4.0</jna.version>
-		<android.maven.plugin.version>4.4.3</android.maven.plugin.version>
+		<android.maven.plugin.version>4.5.0</android.maven.plugin.version>
 		<android.plugin.version>4.1.1.4</android.plugin.version>
 		<junit.version>3.8.1</junit.version>
 		<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
@@ -103,15 +103,38 @@
 							<pluginExecutions>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>com.simpligility.maven.plugins</groupId>
-										<artifactId>android-maven-plugin</artifactId>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-dependency-plugin
+										</artifactId>
+										<versionRange>[2.1,)</versionRange>
+										<goals>
+											<goal>unpack-dependencies</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											com.simpligility.maven.plugins
+										</groupId>
+										<artifactId>
+											android-maven-plugin
+										</artifactId>
 										<versionRange>[4.4.3,)</versionRange>
 										<goals>
+											<goal>generate-sources</goal>
 											<goal>emma</goal>
+											<goal>proguard</goal>
 										</goals>
 									</pluginExecutionFilter>
 									<action>
-										<ignore />
+										<ignore></ignore>
 									</action>
 								</pluginExecution>
 							</pluginExecutions>

rust/.gitignore

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

rust/Cargo.toml

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

rust/src/android_editor.rs

@@ -113,7 +113,7 @@ impl Editor for AndroidImpl {
 		}
 	}
 
-	fn show_message(&self, message: &'static str) -> UserSelection {
+	fn show_message(&self, message: & str) -> UserSelection {
 		debug!("Showing Message '{}'", message);
 		(self.show_message_cb)(super::to_java_string(message.to_string()));
 		let user_selection = self.rx.recv().unwrap();