From c74192d578e647a8386ac8663d6c99521f28b110 Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Tue, 13 Jun 2017 10:36:00 -0700
Subject: [PATCH] Adding conditional code into Gradle, this is a bit dirty
 since we can't explicitly test it but we'll just have to rely on jasmine

---
 bin/templates/project/app/build.gradle | 6 ++++--
 framework/cordova.gradle               | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/templates/project/app/build.gradle b/bin/templates/project/app/build.gradle
index 78a1770d..c9a42369 100644
--- a/bin/templates/project/app/build.gradle
+++ b/bin/templates/project/app/build.gradle
@@ -98,10 +98,12 @@ if (hasBuildExtras) {
 
 // Set property defaults after extension .gradle files.
 if (ext.cdvCompileSdkVersion == null) {
-    ext.cdvCompileSdkVersion = project.ext.defaultCompileSdkVersion
+    ext.cdvCompileSdkVersion = privateHelpers.getProjectTarget()
+    //ext.cdvCompileSdkVersion = project.ext.defaultCompileSdkVersion
 }
 if (ext.cdvBuildToolsVersion == null) {
-    ext.cdvBuildToolsVersion = project.ext.defaultBuildToolsVersion
+    ext.cdvBuildToolsVersion = privateHelpers.findLatestInstalledBuildTools()
+    //ext.cdvBuildToolsVersion = project.ext.defaultBuildToolsVersion
 }
 if (ext.cdvDebugSigningPropertiesFile == null && file('debug-signing.properties').exists()) {
     ext.cdvDebugSigningPropertiesFile = 'debug-signing.properties'
diff --git a/framework/cordova.gradle b/framework/cordova.gradle
index 21a01bb5..0131a265 100644
--- a/framework/cordova.gradle
+++ b/framework/cordova.gradle
@@ -29,7 +29,11 @@ String doEnsureValueExists(filePath, props, key) {
 
 String doGetProjectTarget() {
     def props = new Properties()
-    file('project.properties').withReader { reader ->
+    def propertiesFile = 'project.properties';
+    if(!(file(propertiesFile).exists())) {
+      propertiesFile = '../project.properties';
+    }
+    file(propertiesFile).withReader { reader ->
         props.load(reader)
     }
     return doEnsureValueExists('project.properties', props, 'target')