From: Artur Signell <artur@vaadin.com>
Date: Fri, 21 Nov 2014 07:12:21 +0000 (+0200)
Subject: Update to GWT 2.7.0 (#14522)
X-Git-Tag: 7.4.0.beta1~82
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0545cb2999c83b11da55477211b87865bae98bba;p=vaadin-framework.git

Update to GWT 2.7.0 (#14522)

GWT codeserver has been integrated into gwt-dev.jar

Change-Id: Ia9cd252482e25ed8e0d69da7c0e702d6407efd8b
---

diff --git a/build.properties b/build.properties
index 9df1c8d767..286713b616 100644
--- a/build.properties
+++ b/build.properties
@@ -6,5 +6,5 @@ vaadin.url=http://vaadin.com
 vaadin.java.version=1.6
 vaadin.version=0.0.0.unversioned-development-build
 vaadin.sass.version=0.9.10
-gwt.version=2.7.0.beta1vaadin1
+gwt.version=2.7.0.vaadin1
 commons-io.version=2.4
diff --git a/gwt-files.xml b/gwt-files.xml
index c0ef583177..26126a7ffb 100644
--- a/gwt-files.xml
+++ b/gwt-files.xml
@@ -7,44 +7,37 @@
     <ivy:cachepath pathid="gwt-dev.classpath" conf="gwt-dev" />
     <ivy:cachepath pathid="gwt-user.classpath" conf="gwt-user" />
     <ivy:cachepath pathid="gwt-elemental.classpath" conf="gwt-elemental" />
-    <ivy:cachepath pathid="gwt-codeserver.classpath" conf="gwt-codeserver" />
 
     <property name="gwt.eclipse.basedir" location="${gwt.basedir}/eclipse" />
 
     <property name="gwt.user.jar" refid="gwt-user.classpath" />
     <property name="gwt.dev.jar" refid="gwt-dev.classpath" />
     <property name="gwt.elemental.jar" refid="gwt-elemental.classpath" />
-    <property name="gwt.codeserver.jar" refid="gwt-codeserver.classpath" />
 
     <available file="${gwt.dev.jar}" property="gwt.dev.jar.found" />
     <available file="${gwt.user.jar}" property="gwt.user.jar.found" />
     <available file="${gwt.elemental.jar}" property="gwt.elemental.jar.found" />
-    <available file="${gwt.codeserver.jar}" property="gwt.codeserver.jar.found" />
 
     <property name="gwt.unpack.dir" location="${vaadin.basedir}/build/gwt" />
 
     <property name="gwt.user.jar.files" location="${gwt.unpack.dir}/gwt-user.jar" />
     <property name="gwt.dev.jar.files" location="${gwt.unpack.dir}/gwt-dev.jar" />
     <property name="gwt.elemental.jar.files" location="${gwt.unpack.dir}/gwt-elemental.jar" />
-    <property name="gwt.codeserver.jar.files" location="${gwt.unpack.dir}/gwt-codeserver.jar" />
 
     <target name="unpack.gwt">
         <fail unless="gwt.dev.jar.found" message="Could not find gwt-dev.jar at ${gwt.dev.jar}" />
         <fail unless="gwt.user.jar.found" message="Could not find gwt-user.jar at ${gwt.user.jar}" />
         <fail unless="gwt.elemental.jar.found" message="Could not find gwt-elemental.jar at ${gwt.elemental.jar}" />
-        <fail unless="gwt.codeserver.jar.found" message="Could not find gwt-codeserver.jar at ${gwt.codeserver.jar}" />
 
         <delete dir="${gwt.unpack.dir}" />
 
         <mkdir dir="${gwt.user.jar.files}" />
         <mkdir dir="${gwt.dev.jar.files}" />
         <mkdir dir="${gwt.elemental.jar.files}" />
-        <mkdir dir="${gwt.codeserver.jar.files}" />
 
         <unzip dest="${gwt.user.jar.files}" src="${gwt.user.jar}" />
         <unzip dest="${gwt.dev.jar.files}" src="${gwt.dev.jar}" />
         <unzip dest="${gwt.elemental.jar.files}" src="${gwt.elemental.jar}" />
-        <unzip dest="${gwt.codeserver.jar.files}" src="${gwt.codeserver.jar}" />
     </target>
 
     <union id="client-compiler.gwt.includes">
@@ -124,10 +117,6 @@
 
         </fileset>
 
-        <!-- GWT SuperDevMode -->
-        <fileset dir="${gwt.codeserver.jar.files}">
-            <exclude name="META-INF/**" />
-        </fileset>
     </union>
 
     <union id="client-compiled-cache.gwt.includes">