From 236ed65fdaaad0abeb2ef094a00f233ea741b821 Mon Sep 17 00:00:00 2001 From: Egor Date: Fri, 10 May 2019 21:06:44 -0700 Subject: Updated samples: enabled GLTF Viewer android build --- DiligentSamples | 2 +- Tests/Android/build.gradle | 2 +- Tests/Android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- unityplugin/Android/build.gradle | 2 +- unityplugin/Android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DiligentSamples b/DiligentSamples index fc6f8fd..df94370 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit fc6f8fdbab84376ecd56c99344c793012c9b440f +Subproject commit df94370899185cd646864127a7b98319a1cc6599 diff --git a/Tests/Android/build.gradle b/Tests/Android/build.gradle index 5ed3ba1..8139abe 100644 --- a/Tests/Android/build.gradle +++ b/Tests/Android/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.0' } } diff --git a/Tests/Android/gradle/wrapper/gradle-wrapper.properties b/Tests/Android/gradle/wrapper/gradle-wrapper.properties index 0a35893..4db3b1f 100644 --- a/Tests/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Tests/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Feb 16 08:51:24 PST 2019 +#Fri May 10 20:41:52 PDT 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 diff --git a/unityplugin/Android/build.gradle b/unityplugin/Android/build.gradle index 18e5480..eadb46a 100644 --- a/unityplugin/Android/build.gradle +++ b/unityplugin/Android/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.0' } } diff --git a/unityplugin/Android/gradle/wrapper/gradle-wrapper.properties b/unityplugin/Android/gradle/wrapper/gradle-wrapper.properties index b50a20b..8570137 100644 --- a/unityplugin/Android/gradle/wrapper/gradle-wrapper.properties +++ b/unityplugin/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Feb 16 08:40:10 PST 2019 +#Fri May 10 20:48:27 PDT 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 -- cgit v1.2.3