Merge pull request #1483 from NativeScript/trifonov/hotfix-6.1.1

Release 6.1.1

Author: vtrifonov

CHANGELOG.md

@@ -1,3 +1,10 @@
+6.1.1
+==
+
+## Bug Fixes
+
+- [When using kotlin sometimes the metadata is not existing in the result apk (#1476)](https://github.com/NativeScript/android-runtime/issues/1476)
+
 6.1.0
 ==
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tns-android",
   "description": "NativeScript Runtime for Android",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"

test-app/app/build.gradle

@@ -290,6 +290,29 @@ android {
     applyBeforePluginGradleConfiguration()
     applyPluginGradleConfigurations()
     applyAppGradleConfiguration()
+
+    def initializeMergedAssetsOutputPath = { ->
+      android.applicationVariants.all { variant ->
+          if (variant.buildType.name == project.selectedBuildType) {
+              def task
+              if (variant.metaClass.respondsTo(variant, "getMergeAssetsProvider")) {
+                  def provider = variant.getMergeAssetsProvider()
+                  task = provider.get();
+              } else {
+                  // fallback for older android gradle plugin versions
+                  task = variant.getMergeAssets()
+              }
+              for (File file : task.getOutputs().getFiles()) {
+                  if (!file.getPath().contains("/incremental/")) {
+                      project.ext.mergedAssetsOutputPath = file.getPath()
+                      break;
+                  }
+              }
+          }
+      }
+    }
+
+    initializeMergedAssetsOutputPath()
 }
 
 def externalRuntimeExists = !findProject(':runtime').is(null)
@@ -449,8 +472,7 @@ tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->
     }
     if (currentTask =~ /compile.+JavaWithJavac/) {
         currentTask.dependsOn(runSbg)
-        currentTask.finalizedBy(ensureMetadataOutDir)
-        ensureMetadataOutDir.finalizedBy(buildMetadata)
+        currentTask.finalizedBy(buildMetadata)
     }
     if (currentTask =~ /merge.*Assets/) {
         currentTask.shouldRunAfter(buildMetadata)
@@ -491,13 +513,6 @@ task runSbg(type: JavaExec) {
     }
 }
 
-task ensureMetadataOutDir {
-    doLast {
-        def outputDir = file("$METADATA_OUT_PATH")
-        outputDir.mkdirs()
-    }
-}
-
 def failOnCompilationWarningsEnabled() {
     return project.hasProperty("failOnCompilationWarnings") && (failOnCompilationWarnings || failOnCompilationWarnings.toBoolean())
 }
@@ -547,6 +562,14 @@ class EmptyRunnable implements Runnable {
     }
 }
 
+def getMergedAssetsOutputPath() {
+    if (!project.hasProperty("mergedAssetsOutputPath")) {
+        // 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
+}
+
 // Discover all jars and dynamically create tasks for the extraction of each of them
 project.ext.allJars = []
 afterEvaluate { project ->
@@ -695,11 +718,28 @@ task collectAllJars {
     }
 }
 
+task copyMetadata {
+    doLast {
+        copy {
+          from "$projectDir/src/main/assets/metadata"
+          into getMergedAssetsOutputPath() + "/metadata"
+        }
+    }
+}
+
 task buildMetadata(type: JavaExec) {
     if (!findProject(':android-metadata-generator').is(null)) {
         dependsOn ':android-metadata-generator:jar'
     }
 
+    // As some external gradle plugins can reorder the execution order of the tasks it may happen that buildMetadata is executed after merge{Debug/Release}Assets
+    // in that case the metadata won't be included in the result apk and it will crash, so to avoid this we are adding the copyMetadata task which will manually copy
+    // the metadata files in the merge assets folder and they will be added to the result apk
+
+    // The next line is added to avoid adding another copyData implementation from the firebase plugin - https://github.com/EddyVerbruggen/nativescript-plugin-firebase/blob/3943bb9147f43c41599e801d026378eba93d3f3a/publish/scripts/installer.js#L1105
+    //buildMetadata.finalizedBy(copyMetadata)
+    finalizedBy copyMetadata
+
     description "builds metadata with provided jar dependencies"
 
     inputs.files("$MDG_JAVA_DEPENDENCIES")
@@ -719,6 +759,8 @@ task buildMetadata(type: JavaExec) {
         // these need to be called after the classes have compiled
         assert file(classesDir).exists()
 
+        new File(getMergedAssetsOutputPath() + "/metadata").deleteDir()
+
         def classesSubDirs = new File(classesDir).listFiles()
         def selectedBuildType = project.ext.selectedBuildType