revert old logic

Author: Mihail Slavchev

build/project-template-gradle/build.gradle

@@ -40,7 +40,6 @@ def nodeModulesDir = "../../node_modules/"
 def libDir = "../../lib/Android/"
 def pluginNames = new ArrayList<String>()
 def configDir = file(configurationsDir)
-def firstApplicationBuildType = ""
 
 def compiteCompileSdkVersion () {
 	if(project.hasProperty("compileSdk")) {
@@ -128,19 +127,15 @@ android {
 
 	applicationVariants.all { variant ->
 		renameResultApks(variant)
-		
-		if (firstApplicationBuildType == "") {
-			firstApplicationBuildType = variant.buildType.name;
-		}
 
-		def mergeAssetsTask = variant.dex
+		def mergeAssetsTask = variant.mergeAssets
 		if(project.hasProperty("runSBGenerator")) {
-			runBindingGenerator.dependsOn(buildMetadata)
+			runBindingGenerator.dependsOn(copyMetadata)
 			rbg.dependsOn(runBindingGenerator)
 			mergeAssetsTask.dependsOn(rbg)
 		}
 		else {
-			mergeAssetsTask.dependsOn(buildMetadata)
+			mergeAssetsTask.dependsOn(copyMetadata)
 		}
 	}
 }
@@ -323,6 +318,10 @@ task cleanLocalAarFiles(type: Delete) {
 	delete fileTree(dir: "libs/aar", include: ["*.aar"])
 }
 
+task deleteJavaDir (type: Delete) {
+	delete "$rootDir/src/main/java"
+}
+
 task ensureMetadataOutDir {
 	def outputDir = file("$rootDir/metadata/output")
 	outputDir.mkdirs()
@@ -348,8 +347,6 @@ task collectAllJars {
 			allJarPaths.add(currentJarFile.getAbsolutePath())
 		}
 
-		allJarPaths.add("$rootDir/build/intermediates/classes");
-		
 		metadataParams.add("metadata-generator.jar")
 		metadataParams.add("../metadata/output")
 		for(def i = 0; i < allJarPaths.size(); i++) {
@@ -358,37 +355,56 @@ task collectAllJars {
 	}
 }
 
-task buildMetadata (type: JavaExec) {
-	description "builds metadata with provided jar dependencies"
+task isMetadataGenerationNecessary {
+	description "checks if new metadata is necessary based on jar and aar dependencies used"
+	def inputFile = new File("build/metadataUTD")
+	def metadataDir = new File("metadata/output");
 
-	inputs.files(allJarPaths)
-	inputs.dir("build/intermediates/classes")
+	inputs.file inputFile
+	outputs.upToDateWhen {
+		inputFile.exists() && 
+		metadataDir.exists() &&
+		metadataDir.list().length == 3 &&
+		(inputFile.text.trim() == metadataParams.toString().trim())
+	}
 
-	outputs.files("metadata/output/treeNodeStream.dat", "metadata/output/treeStringsStream.dat", "metadata/output/treeValueStream.dat")
+	doLast {
+		inputFile.text = metadataParams
+	}
+}
 
+task buildMetadata (type: JavaExec) {
+	description "builds metadata with provided jar dependencies"
+	outputs.upToDateWhen {
+		!isMetadataGenerationNecessary.didWork
+	}
+	
 	doFirst {
 		workingDir "build-tools"
 
 		main "-jar"
 
 		args metadataParams.toArray()
 	}
-	
-	doLast {
-		copy {
-			from "metadata/output"
-			into "build/intermediates/assets/${firstApplicationBuildType}/metadata"
-		}
+}
+
+task copyMetadata(type: Copy) {
+	description "moves metadata to the right place before packaging is done"
+	outputs.upToDateWhen {
+		!buildMetadata.didWork
 	}
+
+	from "metadata/output"
+	into "src/main/assets/metadata"
 }
 
 
 task deleteExplodedAarFolder (type: Delete) {
 
 	outputs.upToDateWhen {
-		!buildMetadata.didWork
+		!isMetadataGenerationNecessary.didWork
 	}
-
+	
 	def explodedAarDir = project.buildDir.getAbsolutePath() + "/intermediates/exploded-aar"
 	delete explodedAarDir
 }
@@ -417,9 +433,12 @@ task rbg (dependsOn: "asbg:generatebindings")
 // 5. plugin extend (apply from include files)
 
 // --execution phase
-ensureMetadataOutDir.dependsOn(cleanLocalAarFiles)
+deleteJavaDir.dependsOn(cleanLocalAarFiles)
+ensureMetadataOutDir.dependsOn(deleteJavaDir)
 collectAllJars.dependsOn(ensureMetadataOutDir)
-buildMetadata.dependsOn(collectAllJars)
+isMetadataGenerationNecessary.dependsOn(collectAllJars)
+buildMetadata.dependsOn(isMetadataGenerationNecessary)
+copyMetadata.dependsOn(buildMetadata)
 
 //DO NOT UNCOMMENT
 // mergeAssets.dependsOn(copyMetadata) -> look in CONFIGURATIONS(top) in android.applicationVariants to see how it's done
@@ -438,4 +457,4 @@ task buildapk {
 	}
 
 	dependsOn deleteExplodedAarFolder
-}
+}