claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Android build filed for Gradle 5.x

Browse source 
Fixes #597
This commit is contained in:
Sascha Willems 2019-08-04 13:48:09 +02:00
parent 70cfb3e756
commit c3f1692486
69 changed files with 78 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/build.gradle
View file

@ -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
}

2
android/examples/_template/build.gradle
View file

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

2
android/examples/bloom/build.gradle
View file

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

2
android/examples/computecloth/build.gradle
View file

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

2
android/examples/computecullandlod/build.gradle
View file

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

2
android/examples/computeheadless/build.gradle
View file

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

2
android/examples/computenbody/build.gradle
View file

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

2
android/examples/computeparticles/build.gradle
View file

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

2
android/examples/computeraytracing/build.gradle
View file

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

2
android/examples/computeshader/build.gradle
View file

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

2
android/examples/conservativeraster/build.gradle
View file

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

2
android/examples/debugmarker/build.gradle
View file

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

2
android/examples/deferred/build.gradle
View file

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

2
android/examples/deferredmultisampling/build.gradle
View file

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

2
android/examples/deferredshadows/build.gradle
View file

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

2
android/examples/descriptorsets/build.gradle
View file

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

2
android/examples/displacement/build.gradle
View file

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

2
android/examples/distancefieldfonts/build.gradle
View file

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

2
android/examples/dynamicuniformbuffer/build.gradle
View file

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

2
android/examples/gears/build.gradle
View file

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

2
android/examples/geometryshader/build.gradle
View file

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

2
android/examples/hdr/build.gradle
View file

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

2
android/examples/imgui/build.gradle
View file

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

2
android/examples/indirectdraw/build.gradle
View file

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

2
android/examples/inlineuniformblocks/build.gradle
View file

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

2
android/examples/inputattachments/build.gradle
View file

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

2
android/examples/instancing/build.gradle
View file

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

2
android/examples/mesh/build.gradle
View file

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

2
android/examples/multisampling/build.gradle
View file

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

2
android/examples/multithreading/build.gradle
View file

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

2
android/examples/multiview/build.gradle
View file

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

2
android/examples/negativeviewportheight/build.gradle
View file

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

2
android/examples/occlusionquery/build.gradle
View file

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

2
android/examples/offscreen/build.gradle
View file

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

2
android/examples/parallaxmapping/build.gradle
View file

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

2
android/examples/particlefire/build.gradle
View file

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

2
android/examples/pbrbasic/build.gradle
View file

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

2
android/examples/pbribl/build.gradle
View file

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

2
android/examples/pbrtexture/build.gradle
View file

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

2
android/examples/pipelines/build.gradle
View file

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

2
android/examples/pipelinestatistics/build.gradle
View file

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

2
android/examples/pushconstants/build.gradle
View file

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

2
android/examples/pushdescriptors/build.gradle
View file

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

2
android/examples/radialblur/build.gradle
View file

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

2
android/examples/renderheadless/build.gradle
View file

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

2
android/examples/scenerendering/build.gradle
View file

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

2
android/examples/screenshot/build.gradle
View file

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

2
android/examples/shadowmapping/build.gradle
View file

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

2
android/examples/shadowmappingcascade/build.gradle
View file

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

2
android/examples/shadowmappingomni/build.gradle
View file

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

2
android/examples/skeletalanimation/build.gradle
View file

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

2
android/examples/specializationconstants/build.gradle
View file

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

2
android/examples/sphericalenvmapping/build.gradle
View file

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

2
android/examples/ssao/build.gradle
View file

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

2
android/examples/stencilbuffer/build.gradle
View file

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

2
android/examples/subpasses/build.gradle
View file

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

2
android/examples/terraintessellation/build.gradle
View file

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

2
android/examples/tessellation/build.gradle
View file

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

2
android/examples/textoverlay/build.gradle
View file

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

2
android/examples/texture/build.gradle
View file

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

2
android/examples/texture3d/build.gradle
View file

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

2
android/examples/texturearray/build.gradle
View file

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

2
android/examples/texturecubemap/build.gradle
View file

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

2
android/examples/texturemipmapgen/build.gradle
View file

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

2
android/examples/triangle/build.gradle
View file

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

2
android/examples/viewportarray/build.gradle
View file

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

2
android/examples/vulkanscene/build.gradle
View file

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

4
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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

74
android/settings.gradle
View file

@ -1,65 +1,9 @@
include 'examples/:bloom'
include 'examples/:computecloth'
include 'examples/:computecullandlod'
include 'examples/:computeheadless'
include 'examples/:computenbody'
include 'examples/:computeparticles'
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'
file('examples').eachDir { sub ->
if (sub.name != '_template') {
if (file("examples/$sub.name/build.gradle").exists()) {
println("Adding project $sub.name")
include ":$sub.name"
project(":$sub.name").projectDir = new File("examples/$sub.name")
}
}
}