Updated Android build filed for Gradle 5.x

Fixes #597

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

android/examples/_template/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/bloom/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/computecloth/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/computecullandlod/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/computeheadless/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/computenbody/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/computeparticles/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/computeraytracing/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/computeshader/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/conservativeraster/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/debugmarker/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/deferred/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/deferredmultisampling/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/deferredshadows/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/descriptorsets/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/displacement/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/distancefieldfonts/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/dynamicuniformbuffer/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/gears/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/geometryshader/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/hdr/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/imgui/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/indirectdraw/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/inlineuniformblocks/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/inputattachments/build.gradle

@@ -40,7 +40,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/instancing/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/mesh/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/multisampling/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/multithreading/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/multiview/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/negativeviewportheight/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/occlusionquery/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/offscreen/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/parallaxmapping/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/particlefire/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/pbrbasic/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/pbribl/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/pbrtexture/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/pipelines/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/pipelinestatistics/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/pushconstants/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/pushdescriptors/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/radialblur/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/renderheadless/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/scenerendering/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/screenshot/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/shadowmapping/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/shadowmappingcascade/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/shadowmappingomni/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/skeletalanimation/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/specializationconstants/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/sphericalenvmapping/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/ssao/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/stencilbuffer/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/subpasses/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/terraintessellation/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/tessellation/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/textoverlay/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/texture/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/texture3d/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/texturearray/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/texturecubemap/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/texturemipmapgen/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/triangle/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/viewportarray/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/examples/vulkanscene/build.gradle

@@ -35,7 +35,7 @@ android {
     }
 }
 
-task copyTask << {
+task copyTask {
     copy {
         from '../../common/res/drawable'
         into "src/main/res/drawable"

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Mar 29 13:13:21 CET 2019
+#Sun Aug 04 12:29:22 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

android/settings.gradle

@@ -1,65 +1,9 @@
-include 'examples/:bloom'
+file('examples').eachDir { sub ->
-include 'examples/:computecloth'
+    if (sub.name != '_template') {
-include 'examples/:computecullandlod'
+        if (file("examples/$sub.name/build.gradle").exists()) {
-include 'examples/:computeheadless'
+            println("Adding project $sub.name")
-include 'examples/:computenbody'
+            include ":$sub.name"
-include 'examples/:computeparticles'
+            project(":$sub.name").projectDir = new File("examples/$sub.name")
-include 'examples/:computeraytracing'
+        }
-include 'examples/:computeshader'
+    }
-include 'examples/:conservativeraster'
+}
-include 'examples/:debugmarker'
-include 'examples/:deferred'
-include 'examples/:deferredmultisampling'
-include 'examples/:deferredshadows'
-include 'examples/:descriptorsets'
-include 'examples/:displacement'
-include 'examples/:distancefieldfonts'
-include 'examples/:dynamicuniformbuffer'
-include 'examples/:gears'
-include 'examples/:geometryshader'
-include 'examples/:hdr'
-include 'examples/:imgui'
-include 'examples/:indirectdraw'
-include 'examples/:inlineuniformblocks'
-include 'examples/:instancing'
-include 'examples/:inputattachments'
-include 'examples/:mesh'
-include 'examples/:multisampling'
-include 'examples/:multithreading'
-include 'examples/:multiview'
-include 'examples/:negativeviewportheight'
-include 'examples/:occlusionquery'
-include 'examples/:offscreen'
-include 'examples/:parallaxmapping'
-include 'examples/:particlefire'
-include 'examples/:pbrbasic'
-include 'examples/:pbribl'
-include 'examples/:pbrtexture'
-include 'examples/:pipelines'
-include 'examples/:pipelinestatistics'
-include 'examples/:pushconstants'
-include 'examples/:pushdescriptors'
-include 'examples/:radialblur'
-include 'examples/:renderheadless'
-include 'examples/:scenerendering'
-include 'examples/:screenshot'
-include 'examples/:shadowmapping'
-include 'examples/:shadowmappingcascade'
-include 'examples/:shadowmappingomni'
-include 'examples/:skeletalanimation'
-include 'examples/:specializationconstants'
-include 'examples/:sphericalenvmapping'
-include 'examples/:ssao'
-include 'examples/:stencilbuffer'
-include 'examples/:subpasses'
-include 'examples/:terraintessellation'
-include 'examples/:tessellation'
-include 'examples/:textoverlay'
-include 'examples/:texture'
-include 'examples/:texture3d'
-include 'examples/:texturearray'
-include 'examples/:texturecubemap'
-include 'examples/:texturemipmapgen'
-include 'examples/:triangle'
-include 'examples/:viewportarray'
-include 'examples/:vulkanscene'