Merge branch 'develop'

bdunn44 · May 25, 2017 · 016b741 · 016b741
2 parents b5cda5f + 7f7d276
commit 016b741
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ def scribeVersion = '2.7.3'
 ext.scribeVersion = scribeVersion
 
 task wrapper(type: Wrapper) {
-   gradleVersion = '2.13' //version required
+   gradleVersion = '3.5'
 }
 
 allprojects {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 13 16:58:49 MDT 2016
+#Thu May 25 13:24:11 MDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/oauthpopup-demo/.gitignore b/oauthpopup-demo/.gitignore
@@ -1,3 +1,3 @@
 /build/
 /bin/
-/src/main/resources/client_secret.*.json
+/src/main/resources/client_secret*
diff --git a/oauthpopup-demo/build.gradle b/oauthpopup-demo/build.gradle
@@ -40,7 +40,7 @@ vaadin {
 	}
 	vaadinRun {
 		serverPort = 8080
-		openInBrowser false
+		openInBrowser true
 	}
 }
 

diff --git a/oauthpopup-demo/src/main/java/org/vaadin/addon/oauthpopup/demo/DemoUI.java b/oauthpopup-demo/src/main/java/org/vaadin/addon/oauthpopup/demo/DemoUI.java
@@ -20,7 +20,7 @@
 public class DemoUI extends UI {
 
 	@WebServlet(value = "/*", asyncSupported = true)
-	@VaadinServletConfiguration(productionMode = false, ui = DemoUI.class, widgetset = "org.vaadin.addon.oauthpopup.demo.AppWidgetset")
+	@VaadinServletConfiguration(productionMode = false, ui = DemoUI.class)
 	public static class Servlet extends VaadinServlet {  }
 
 	private VerticalLayout layout;

diff --git a/oauthpopup/src/main/java/org/vaadin/addon/oauthpopup/OAuthPopupOpener.java b/oauthpopup/src/main/java/org/vaadin/addon/oauthpopup/OAuthPopupOpener.java
@@ -1,12 +1,11 @@
 package org.vaadin.addon.oauthpopup;
 
+import java.util.LinkedList;
+
 import com.github.scribejava.core.builder.api.DefaultApi10a;
 import com.github.scribejava.core.builder.api.DefaultApi20;
 import com.github.scribejava.core.model.Token;
 import com.vaadin.server.BrowserWindowOpener;
-import com.vaadin.ui.UI;
-
-import java.util.LinkedList;
 
 /**
  * Component extension that opens an OAuth authorization popup window when the extended

diff --git a/oauthpopup/src/main/java/org/vaadin/addon/oauthpopup/URLBasedButton.java b/oauthpopup/src/main/java/org/vaadin/addon/oauthpopup/URLBasedButton.java
@@ -14,7 +14,9 @@
  */
 public class URLBasedButton extends OAuthPopupButton {
 
-    public URLBasedButton(DefaultApi20 api, OAuthPopupConfig config) {
+	private static final long serialVersionUID = -4543927777891305834L;
+
+	public URLBasedButton(DefaultApi20 api, OAuthPopupConfig config) {
         super(new URLBasedOAuthPopupOpener(api, config));
     }
 }