Merge pull request #879 from NativeScript/pete/fix-appgradle-apply

petekanev · web-flow · commit 3a2d3b233336 · 2017-11-09T15:04:27.000+02:00
apply user configuration before plugins' configuration to provide external properties
diff --git a/build-artifacts/project-template-gradle/build.gradle b/build-artifacts/project-template-gradle/build.gradle
@@ -145,6 +145,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."
 	}
 }
 
@@ -225,6 +227,8 @@ android {
 		}
 	}
 
+	applyAppGradleConfiguration()
+
 	def dimensions = applyPluginsIncludeGradleConfigurations()
 	
 	flavorDimensions(*dimensions)
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "files": [
     "**/*"
   ]

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ def applyAppGradleConfiguration = { ->`
`145`	`145`	`if (appGradle.exists()) {`
`146`	`146`	`println "\t + applying user-defined configuration from ${appGradle}"`
`147`	`147`	`apply from: pathToAppGradle`
	`148`	`+ } else {`
	`149`	`+ println "\t + couldn't load user-defined configuration from ${appGradle}. File doesn't exist."`
`148`	`150`	`}`
`149`	`151`	`}`
`150`	`152`
`@@ -225,6 +227,8 @@ android {`
`225`	`227`	`}`
`226`	`228`	`}`
`227`	`229`
	`230`	`+ applyAppGradleConfiguration()`
	`231`	`+`
`228`	`232`	`def dimensions = applyPluginsIncludeGradleConfigurations()`
`229`	`233`
`230`	`234`	`flavorDimensions(*dimensions)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "tns-android",`
`3`	`3`	`"description": "NativeScript Runtime for Android",`
`4`		`- "version": "3.3.0",`
	`4`	`+ "version": "3.3.1",`
`5`	`5`	`"files": [`
`6`	`6`	`"*/"`
`7`	`7`	`]`