From 8a7661a44f1d950c4bdd74ed9f7ad6840b2171bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 31 Mar 2017 10:56:30 +0200 Subject: [PATCH] Gradle: Use the main assets directory instead of the android/assets one which is only updated when doing old style builds... --- .gitignore | 4 +++- android/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ae9e0cdab..94e91f9e1d 100644 --- a/.gitignore +++ b/.gitignore @@ -55,9 +55,11 @@ build build.ios versionname.txt versioncode.txt - build*/ +# Temp file used by jenkins windows build (TODO: remove) +desc.txt + Logs Memstick diff --git a/android/build.gradle b/android/build.gradle index 11cbf125fd..8a9a715599 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.gladed.androidgitversion' version '0.3.3' + id 'com.gladed.androidgitversion' version '0.3.4' } apply plugin: 'com.android.application' @@ -89,7 +89,7 @@ android { aidl.srcDirs = ['src'] resources.srcDirs = ['src'] assets.srcDirs = [ - 'assets', + '../assets', ] jni.srcDirs = ['..'] }