From 19f082a3a8598b79f71c2f16f2710ab2d6119a3d Mon Sep 17 00:00:00 2001
From: Phillip Johnson <phillip@letstalkdata.com>
Date: Fri, 26 May 2017 09:38:41 -0400
Subject: [PATCH] Adding support for Vaadin 8.  - Changed Vaadin version in pom
  - Replaced removed "reindeer" theme with "valo" in demo  - Updated README

---
 .gitignore                                           |  3 +++
 README.md                                            | 12 ++++++------
 pom.xml                                              |  2 +-
 webcam-demo/pom.xml                                  |  4 ++--
 .../src/main/webapp/VAADIN/themes/demo/styles.scss   |  6 +++---
 webcam/pom.xml                                       |  4 ++--
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0f0d9b0..cb38c24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 webcam/target
 webcam-demo/target
 webcam-demo/src/main/webapp/VAADIN/widgetsets
+
+.idea
+*.iml
\ No newline at end of file
diff --git a/README.md b/README.md
index 4e316ea..06cdde1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Webcam Add-on for Vaadin 7
+# Webcam Add-on for Vaadin 8
 
-Webcam is an HTML5 webcam component for Vaadin 7.
+Webcam is an HTML5 webcam component for Vaadin 8.
 
 ## Online demo
 
@@ -14,10 +14,10 @@ Official releases of this add-on will later be available at Vaadin Directory. Fo
 
 ## Building and running demo
 
-- git clone https://github.com/tehapo/webcam.git
-- mvn clean install
-- cd demo
-- mvn jetty:run
+- `git clone https://github.com/tehapo/webcam.git`
+- `mvn clean install`
+- `cd webcam-demo`
+- `mvn jetty:run`
 
 To see the demo, navigate to http://localhost:8080/
 
diff --git a/pom.xml b/pom.xml
index f024400..31f6118 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.vaadin.teemu</groupId>
 	<artifactId>webcam-root</artifactId>
 	<packaging>pom</packaging>
-	<version>0.3.0</version>
+	<version>0.3.1-SNAPSHOT</version>
 	<name>Webcam Add-on Root Project</name>
 
 	<modules>
diff --git a/webcam-demo/pom.xml b/webcam-demo/pom.xml
index 5dcbfe1..b2f55d3 100644
--- a/webcam-demo/pom.xml
+++ b/webcam-demo/pom.xml
@@ -5,12 +5,12 @@
 	<groupId>org.vaadin.teemu</groupId>
 	<artifactId>webcam-demo</artifactId>
 	<packaging>war</packaging>
-	<version>0.3.0</version>
+	<version>0.3.1-SNAPSHOT</version>
 	<name>Webcam Add-on Demo</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>7.0.7</vaadin.version>
+		<vaadin.version>8.0.5</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 	</properties>
   
diff --git a/webcam-demo/src/main/webapp/VAADIN/themes/demo/styles.scss b/webcam-demo/src/main/webapp/VAADIN/themes/demo/styles.scss
index 263af35..bc573ab 100644
--- a/webcam-demo/src/main/webapp/VAADIN/themes/demo/styles.scss
+++ b/webcam-demo/src/main/webapp/VAADIN/themes/demo/styles.scss
@@ -1,4 +1,4 @@
-@import "../reindeer/reindeer.scss";
+@import "../valo/valo.scss";
 
 $blue: #00b4f0;
 $gray: #d1d1cf;
@@ -35,8 +35,8 @@ $darkgreen: darken($green, 30%);
 // Prefix all selectors in your theme with .demo
 .demo {
 
-    // Include reindeer theme styles in your theme
-    @include reindeer;
+    // Include valo theme styles in your theme
+    @include valo;
 
     // You can style your demo app right here
     .demoContentLayout {
diff --git a/webcam/pom.xml b/webcam/pom.xml
index fb00e57..0dd2f14 100644
--- a/webcam/pom.xml
+++ b/webcam/pom.xml
@@ -5,12 +5,12 @@
 	<groupId>org.vaadin.teemu</groupId>
 	<artifactId>webcam</artifactId>
 	<packaging>jar</packaging>
-	<version>0.3.0</version>
+	<version>0.3.1-SNAPSHOT</version>
 	<name>Webcam</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>7.0.7</vaadin.version>
+		<vaadin.version>8.0.5</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 
 		<!-- ZIP Manifest fields -->