Upgrade to vaadin 8

mcollovati · Mar 14, 2017 · 3c8e587 · 3c8e587
1 parent aee795d
commit 3c8e587
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,8 +5,11 @@
     <groupId>org.vaadin</groupId>
     <artifactId>spinkit-root</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.0</version>
+    <version>1.0.0</version>
     <name>Spinkit Add-on Root Project</name>
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
 
 	<organization>
 		<name>Marco Collovati</name>

diff --git a/spinkit-demo/pom.xml b/spinkit-demo/pom.xml
@@ -5,20 +5,23 @@
     <groupId>org.vaadin</groupId>
     <artifactId>spinkit-demo</artifactId>
     <packaging>war</packaging>
-    <version>0.1.0</version>
+    <version>1.0.0</version>
     <name>MyComponent Add-on Demo</name>
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <vaadin.version>7.5.6</vaadin.version>
+        <vaadin.version>8.0.2</vaadin.version>
         <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
     </properties>
 
     <organization>
-        <name>My Name</name>
+        <name>Marco Collovati</name>
         <url>https://github.com/mcollovati</url>
     </organization>
-    <inceptionYear>2016</inceptionYear>
+    <inceptionYear>2016-2017</inceptionYear>
     <issueManagement>
         <system>GitHub</system>
         <url>https://github.com/mcollovati/vaadin-spinkit/issues</url>
@@ -87,15 +90,34 @@
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-client-compiler</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-shared</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-client</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin-themes</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-compatibility-themes</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.vaadin</groupId>
             <artifactId>viritin</artifactId>
-            <version>1.49</version>
+            <!-- <version>1.61v8-SNAPSHOT</version> -->
+            <version>2.0.alpha1</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -111,7 +133,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.5.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -120,7 +142,7 @@
 
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.5</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -159,13 +181,13 @@
                 <artifactId>vaadin-maven-plugin</artifactId>
                 <version>${vaadin.plugin.version}</version>
                 <configuration>
-                    <extraJvmArgs>-Xmx512M -Xss1024k</extraJvmArgs>
+                    <extraJvmArgs>-Xmx2048M -Xss1024k</extraJvmArgs>
                     <webappDirectory>${basedir}/src/main/webapp/VAADIN/widgetsets</webappDirectory>
                     <hostedWebapp>${basedir}/src/main/webapp/VAADIN/widgetsets</hostedWebapp>
                     <noServer>true</noServer>
                     <persistentunitcachedir>${basedir}/target/tmp/gwt-unitCache</persistentunitcachedir>
                     <compileReport>true</compileReport>
-                    <strict>true</strict>
+                    <!-- <strict>true</strict> -->
                     <runTarget>http://localhost:8080/</runTarget>
                 </configuration>
                 <executions>

diff --git a/spinkit-demo/src/main/java/org/vaadin/spinkit/demo/DemoUI.java b/spinkit-demo/src/main/java/org/vaadin/spinkit/demo/DemoUI.java
@@ -1,12 +1,12 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
- * <p>
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
+ *
  * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *         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.
@@ -18,18 +18,23 @@
 import com.vaadin.annotations.Theme;
 import com.vaadin.annotations.Title;
 import com.vaadin.annotations.VaadinServletConfiguration;
-import com.vaadin.data.util.converter.StringToEnumConverter;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinServlet;
-import com.vaadin.ui.*;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.util.converter.StringToEnumConverter;
+import com.vaadin.v7.ui.ComboBox;
 import org.vaadin.spinkit.Spinner;
 import org.vaadin.spinkit.SpinnerLabel;
 import org.vaadin.spinkit.shared.SpinnerSize;
 import org.vaadin.spinkit.shared.SpinnerType;
-import org.vaadin.viritin.label.MLabel;
 import org.vaadin.viritin.label.RichText;
-import org.vaadin.viritin.layouts.MHorizontalLayout;
 import org.vaadin.viritin.layouts.MVerticalLayout;
 
 import javax.servlet.annotation.WebServlet;

diff --git a/spinkit-demo/src/main/resources/org/vaadin/spinkit/demo/DemoWidgetSet.gwt.xml b/spinkit-demo/src/main/resources/org/vaadin/spinkit/demo/DemoWidgetSet.gwt.xml
@@ -33,4 +33,6 @@
     <inherits name="com.vaadin.DefaultWidgetSet" />
 
     <inherits name="org.vaadin.spinkit.SpinkitWidgetSet" />
+
+    <inherits name="com.vaadin.v7.Vaadin7WidgetSet" />
 </module>
diff --git a/spinkit-demo/src/main/resources/org/vaadin/spinkit/demo/about.md b/spinkit-demo/src/main/resources/org/vaadin/spinkit/demo/about.md
@@ -1,3 +1,3 @@
-# SpinKit Add-on for Vaadin 7
+# SpinKit Add-on for Vaadin
 
 [Vaadin](http://vaadin.com) UI component that integrates [SpinKit](http://tobiasahlin.com/spinkit/) CSS spinners.
diff --git a/spinkit/pom.xml b/spinkit/pom.xml
@@ -5,12 +5,15 @@
     <groupId>org.vaadin</groupId>
     <artifactId>spinkit</artifactId>
     <packaging>jar</packaging>
-    <version>0.1.0</version>
+    <version>1.0.0</version>
     <name>Spinkit Add-on</name>
 
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <vaadin.version>7.6.4</vaadin.version>
+        <vaadin.version>8.0.2</vaadin.version>
         <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
@@ -28,7 +31,7 @@
         <name>Marco Collovati</name>
         <url>https://github.com/mcollovati</url>
     </organization>
-    <inceptionYear>2016</inceptionYear>
+    <inceptionYear>2016-2017</inceptionYear>
     <issueManagement>
         <system>GitHub</system>
         <url>https://github.com/mcollovati/vaadin-spinkit/issues</url>
@@ -90,7 +93,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -101,13 +104,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.5.1</version>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.0.2</version>
                 <configuration>
                     <archive>
                         <index>true</index>
@@ -129,7 +132,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9</version>
+                <version>2.10.4</version>
                 <executions>
                     <execution>
                         <id>attach-javadoc</id>
@@ -143,7 +146,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -157,7 +160,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
+                <version>2.6</version>
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
@@ -178,13 +181,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.14.1</version>
+                <version>2.19.1</version>
             </plugin>
 
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>2.11</version>
+                <version>3.0</version>
                 <configuration>
                     <header>src/license/APACHE-2.txt</header>
                     <properties>

diff --git a/spinkit/src/main/java/org/vaadin/spinkit/Spinner.java b/spinkit/src/main/java/org/vaadin/spinkit/Spinner.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spinkit/src/main/java/org/vaadin/spinkit/SpinnerLabel.java b/spinkit/src/main/java/org/vaadin/spinkit/SpinnerLabel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,8 @@
  */
 package org.vaadin.spinkit;
 
-import com.vaadin.shared.ui.label.ContentMode;
+
+import com.vaadin.shared.ui.ContentMode;
 import com.vaadin.ui.Label;
 import org.vaadin.spinkit.shared.SpinnerType;
 

diff --git a/spinkit/src/main/java/org/vaadin/spinkit/client/SpinnerConnector.java b/spinkit/src/main/java/org/vaadin/spinkit/client/SpinnerConnector.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spinkit/src/main/java/org/vaadin/spinkit/client/SpinnerWidget.java b/spinkit/src/main/java/org/vaadin/spinkit/client/SpinnerWidget.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spinkit/src/main/java/org/vaadin/spinkit/shared/SpinnerSize.java b/spinkit/src/main/java/org/vaadin/spinkit/shared/SpinnerSize.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spinkit/src/main/java/org/vaadin/spinkit/shared/SpinnerState.java b/spinkit/src/main/java/org/vaadin/spinkit/shared/SpinnerState.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/spinkit/src/main/java/org/vaadin/spinkit/shared/SpinnerType.java b/spinkit/src/main/java/org/vaadin/spinkit/shared/SpinnerType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016 Marco Collovati ([email protected])
+ * Copyright (C) 2016-2017 Marco Collovati ([email protected])
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.