Merge pull request #883 from NativeScript/pete/merge-release-master

merge release (3.3.1) changes into master

Author: petekanev

CHANGELOG.md

@@ -1,14 +1,18 @@
+3.3.1
+==
+
+## Bug Fixes
+
+ - [app.gradle applies before other plugin gradle scripts (#878)](https://github.com/NativeScript/android-runtime/issues/878)
+
 3.3.0
 ==
 
 ## Bug Fixes
 
- - [Provide better error message while parsing js files (#833)]
- (https://github.com/NativeScript/android-runtime/issues/833)
- - [Improve JavaScript Metadata generation (#832)]
- (https://github.com/NativeScript/android-runtime/issues/832)
- - [Improve Error handling incorrectly implementing Java interface (#836)]
- (https://github.com/NativeScript/android-runtime/issues/836)
+ - [Provide better error message while parsing js files (#833)](https://github.com/NativeScript/android-runtime/issues/833)
+ - [Improve JavaScript Metadata generation (#832)](https://github.com/NativeScript/android-runtime/issues/832)
+ - [Improve Error handling incorrectly implementing Java interface (#836)](https://github.com/NativeScript/android-runtime/issues/836)
 
 3.2.0
 ==

build-artifacts/project-template-gradle/app/build.gradle

@@ -138,6 +138,8 @@ def applyAppGradleConfiguration = { ->
 	if (appGradle.exists()) {
 		println "\t + applying user-defined configuration from ${appGradle}"
 		apply from: pathToAppGradle
+	} else {
+		println "\t + couldn't load user-defined configuration from ${appGradle}. File doesn't exist."
 	}
 }
 
@@ -183,11 +185,11 @@ android {
 		renameResultApks(variant)
 	}
 
+	applyAppGradleConfiguration()
+
 	def dimensions = applyPluginsIncludeGradleConfigurations()
 
 	flavorDimensions(*dimensions)
-
-	applyAppGradleConfiguration()
 }
 
 def externalRuntimeExists = !findProject(':runtime').is(null)