Merge pull request #9 from turshija/master

Fix for @nonnull error when compiling .apk
skwasjer · May 4, 2017 · f7df4e8 · f7df4e8
2 parents 20eb21f + 35dbab1
commit f7df4e8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,9 @@ Cordova Plugin for showing a native date, time or datetime picker.
 
 ## Changelog
 
+#### 0.8.0 ####
+- Android: fix @NonNull error when building apk
+
 #### 0.7.0 ####
 - iOS: use auto layout
 - iOS: remove < iOS 7 support (UIActionSheet)

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.7.0",
+    "version": "0.8.0",
     "name": "skwas-cordova-plugin-datetimepicker",
     "cordova_name": "DateTime picker",
     "description": "Cordova DateTime picker plugin",

diff --git a/plugin.xml b/plugin.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
     xmlns:rim="http://www.blackberry.com/ns/widgets"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="skwas-cordova-plugin-datetimepicker"
-    version="0.7.0">
+    version="0.8.0">
     <name>DateTime picker</name>
     <description>Cordova DateTime picker plugin</description>
     <license>MIT</license>

diff --git a/src/android/DateTimePicker.java b/src/android/DateTimePicker.java
@@ -19,12 +19,11 @@
 import android.app.DatePickerDialog;
 import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.TimePickerDialog.OnTimeSetListener;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
 
-import javax.annotation.Nonnull;
-
 public class DateTimePicker extends CordovaPlugin {
 
 	/**
@@ -33,7 +32,7 @@ public class DateTimePicker extends CordovaPlugin {
 	 * Note that not all options are supported, they are here to match the options across all platforms.
 	 */
 	private class DateTimePickerOptions {
-		@Nonnull
+		@NonNull
 		public String mode = "date";
 		public Date date = new Date();
 		public boolean allowOldDates = true;