Change merged assets path for android gradle 3.5.0

vmutafov · web-flow · commit 20a458e89295 · 2019-09-11T15:14:09.000+03:00
diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
@@ -571,8 +571,8 @@ class EmptyRunnable implements Runnable {
 
 def getMergedAssetsOutputPath() {
     if (!project.hasProperty("mergedAssetsOutputPath")) {
-        // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.4.0
-        project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/" + project.selectedBuildType + "/out"
+        // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.5.0
+        project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/merged_assets/" + project.selectedBuildType + "/out"
     }
     return project.ext.mergedAssetsOutputPath
 }

Original file line number	Diff line number	Diff line change
`@@ -571,8 +571,8 @@ class EmptyRunnable implements Runnable {`
`571`	`571`
`572`	`572`	`def getMergedAssetsOutputPath() {`
`573`	`573`	`if (!project.hasProperty("mergedAssetsOutputPath")) {`
`574`		`- // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.4.0`
`575`		`- project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/" + project.selectedBuildType + "/out"`
	`574`	`+ // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.5.0`
	`575`	`+ project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/merged_assets/" + project.selectedBuildType + "/out"`
`576`	`576`	`}`
`577`	`577`	`return project.ext.mergedAssetsOutputPath`
`578`	`578`	`}`