Merge pull request #29 from GwtMaterialDesign/release_2.4.0

Release 2.4.0

Author: kevzlou7979

.utility/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ev
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.3" ]; then
+if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.0" ]; then
   echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
   mvn deploy --settings ~/settings.xml
 fi

README.md

@@ -11,20 +11,20 @@ JQuery interface maintained by GWT Material Design.
 Documentation on the JQuery can be found here: https://api.jquery.com/
 
 ## Maven
-Current Version 2.3.0
+Current Version 2.4.0-rc1
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-jquery</artifactId>
-    <version>2.3.0</version>
+    <version>2.4.0-rc1</version>
 </dependency>
 ```
-Snapshot Version 2.3.1-SNAPSHOT
+Snapshot Version 2.4.0-SNAPSHOT
 ```xml
 <dependency>
     <groupId>com.github.gwtmaterialdesign</groupId>
     <artifactId>gwt-material-jquery</artifactId>
-    <version>2.3.1-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
 </dependency>
 ```
 

pom.xml

@@ -6,11 +6,11 @@
   <groupId>com.github.gwtmaterialdesign</groupId>
   <artifactId>gwt-material-jquery</artifactId>
   <packaging>gwt-lib</packaging>
-  <version>2.3.0</version>
+  <version>2.4.0-rc1</version>
 
   <properties>
-    <gwt.version>2.8.2</gwt.version>
-    <tbroyer.version>1.0-rc-9</tbroyer.version>
+    <gwt.version>2.9.0</gwt.version>
+    <tbroyer.version>1.0.0</tbroyer.version>
     <jscore.version>1.0</jscore.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -38,7 +38,7 @@
     <connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-jquery.git</connection>
     <developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-jquery.git</developerConnection>
     <url>http://github.com/GwtMaterialDesign/gwt-material-jquery</url>
-    <tag>v2.3.0</tag>
+    <tag>v2.4.0-rc1</tag>
   </scm>
 
   <distributionManagement>

src/main/java/gwt/material/design/jquery/client/JQueryEntryPoint.java

@@ -56,6 +56,7 @@ public void onModuleLoad() {
     /**
      * If jQuery JS loaded?
      */
+    //TODO: Convert to JSInterop
     private native boolean isInjected() /*-{
         return !(typeof $wnd.jQuery === "undefined") && !(null === $wnd.jQuery);
     }-*/;

src/main/java/gwt/material/design/jquery/client/api/Promise.java

@@ -24,9 +24,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,28 +36,27 @@
  */
 
 
-import gwt.material.design.jquery.client.api.Functions.FuncRet2;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsType;
 
 /**
- * Represent a JQuery Promise 
+ * Represent a JQuery Promise
  *
  * @author Cristian Rinaldi
  */
-@JsType(name = "Promise", isNative=true)
+@JsType(name = "Promise", isNative = true)
 public interface Promise {
 
     Promise then(Functions.FuncRet1<Object> f);
-    
-    Promise then(FuncRet2<Event, Object> f);
-    
-    Promise done(FuncRet2<Event, Object> f);
-    
-    Promise when(FuncRet2<Event, Object> f);
+
+    Promise then(Functions.EventFunc1<Object> f);
+
+    Promise done(Functions.EventFunc1<Object> f);
+
+    Promise when(Functions.EventFunc1<Object> f);
 
     @JsMethod(name = "catch")
-    Promise fail(FuncRet2<Event, Object> f);
-    
-    Promise always(FuncRet2<Event, Object> f);
+    Promise fail(Functions.EventFunc1<Object> f);
+
+    Promise always(Functions.EventFunc1<Object> f);
 }

src/main/java/gwt/material/design/jscore/JSCore.gwt.xml

@@ -21,7 +21,8 @@
 
 <module>
     <inherits name='com.google.gwt.user.User' />
-    <source path='client' />
+	<inherits name="gwt.material.design.jquery.JQuery"/>
+	<source path='client' />
 
     <set-property name="user.agent" value="ie10, gecko1_8, safari"/>
     <set-configuration-property name="user.agent.runtimeWarning" value="false"/>

src/main/java/gwt/material/design/jscore/client/JSNI.java

@@ -14,15 +14,18 @@
  * @author Cristian Rinaldi
  */
 public class JSNI {
-    
+
+    //TODO: Convert to JSInterop
     public static native Console createConsole() /*-{
         return $wnd.console;
     }-*/;
-    
+
+    //TODO: Convert to JSInterop
     public static native Window createWindow() /*-{
         return $wnd;
     }-*/;
-    
+
+    //TODO: Convert to JSInterop
     public static native JSON createJSON() /*-{
         return $wnd.JSON;
     }-*/;

src/main/java/gwt/material/design/jscore/client/api/media/MediaDevices.java

@@ -16,7 +16,7 @@
  * the License.
  */
 
-import gwt.material.design.jscore.client.api.promise.Promise;
+import gwt.material.design.jquery.client.api.Promise;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsPackage;
 import jsinterop.annotations.JsType;

src/main/java/gwt/material/design/jscore/client/api/polymer/Polymer.java

@@ -17,7 +17,8 @@
 public class Polymer {
 
     public native Element dom(Element e);
-    
+
+    //TODO: Convert to JSInterop
     public static class Static {
         public static native Polymer get() /*-{
             return $wnd.Polymer