Merge branch 'master' into vision-close-client

gguuss · web-flow · commit 7bbbab6fa1a1 · 2017-07-10T17:08:11.000-07:00
diff --git a/appengine-java8/endpoints-v2-backend/build.gradle b/appengine-java8/endpoints-v2-backend/build.gradle
@@ -54,14 +54,14 @@ endpointsServer {
   hostname = "echo-api.endpoints.${projectId}.cloud.goog"
 }
 
-sourceCompatibility = 1.7  // App Engine Standard uses Java 7
-targetCompatibility = 1.7  // App Engine Standard uses Java 7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 // this replaces the ${endpoints.project.id} in appengine-web.xml and web.xml
 task replaceProjectId(type: Copy) {
     from 'src/main/webapp/WEB-INF/'
     include '*.xml'
-    into 'build/exploded-backend/WEB-INF'
+    into "build/exploded-${archivesBaseName}/WEB-INF"
     expand(endpoints:[project:[id:projectId]])
     filteringCharset = 'UTF-8'
 }
