@nativescript/android 8.8.0-alpha.6 → 8.8.0-alpha.8

package/framework/app/build.gradle

@@ -725,6 +725,92 @@ task buildMetadata(type: BuildToolTask) {
         dependsOn ':android-metadata-generator:jar'
     }
 
+
+
+    android.applicationVariants.all { variant ->
+        def buildTypeName = variant.buildType.name.capitalize()
+        def mergeShadersTaskName = "merge${buildTypeName}Shaders"
+        def mergeShadersTask = tasks.findByName(mergeShadersTaskName)
+
+        if (mergeShadersTask) {
+            dependsOn mergeShadersTask
+        }
+
+        def compileJavaWithJavacTaskName = "compile${buildTypeName}JavaWithJavac"
+        def compileJavaWithJavacTask = tasks.findByName(compileJavaWithJavacTaskName)
+
+
+        if (compileJavaWithJavacTask) {
+            dependsOn compileJavaWithJavacTask
+        }
+
+        def compileKotlinTaskName = "compile${buildTypeName}Kotlin"
+        def compileKotlinTask = tasks.findByName(compileKotlinTaskName)
+
+
+        if (compileKotlinTask) {
+            dependsOn compileKotlinTask
+        }
+
+
+        def mergeDexTaskName = "mergeDex${buildTypeName}"
+        def mergeDexTask = tasks.findByName(mergeDexTaskName)
+
+        if (mergeDexTask) {
+            dependsOn mergeDexTask
+        }
+
+        def checkDuplicateClassesTaskName = "check${buildTypeName}DuplicateClasses"
+        def checkDuplicateClassesTask = tasks.findByName(checkDuplicateClassesTaskName)
+
+        if (checkDuplicateClassesTask) {
+            dependsOn checkDuplicateClassesTask
+        }
+
+        def generateBuildConfigTaskName = "generate${buildTypeName}BuildConfig"
+        def generateBuildConfigTask = tasks.findByName(generateBuildConfigTaskName)
+
+        if (generateBuildConfigTask) {
+            dependsOn generateBuildConfigTask
+        }
+
+        def dexBuilderTaskName = "dexBuilder${buildTypeName}"
+        def dexBuilderTask = tasks.findByName(dexBuilderTaskName)
+
+        if (dexBuilderTask) {
+            dependsOn dexBuilderTask
+        }
+
+
+        def mergeExtDexTaskName = "mergeExtDex${buildTypeName}"
+        def mergeExtDexTask = tasks.findByName(mergeExtDexTaskName)
+
+        if (mergeExtDexTask) {
+            dependsOn mergeExtDexTask
+        }
+
+        def mergeLibDexTaskName = "mergeLibDex${buildTypeName}"
+        def mergeLibDexTask = tasks.findByName(mergeLibDexTaskName)
+
+        if (mergeLibDexTask) {
+            dependsOn mergeLibDexTask
+        }
+
+        def mergeProjectDexTaskName = "mergeProjectDex${buildTypeName}"
+        def mergeProjectDexTask = tasks.findByName(mergeProjectDexTaskName)
+
+        if (mergeProjectDexTask) {
+            dependsOn mergeProjectDexTask
+        }
+
+        def syncLibJarsTaskName = "sync${buildTypeName}LibJars"
+        def syncLibJarsTask = tasks.findByName(syncLibJarsTaskName)
+
+        if (syncLibJarsTask) {
+            dependsOn syncLibJarsTask
+        }
+    }
+
     dependsOn copyMetadataFilters
 
     // 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
@@ -955,26 +1041,33 @@ cleanSbg.dependsOn(cleanMdg)
 clean.dependsOn(cleanSbg)
 
 
+//dependsOn {
+//    pattern {
+//        include "merge*.Shaders" // Matches tasks starting with "merge" and ending with "Shaders"
+//    }
+//}
+
+
 tasks.configureEach({ DefaultTask currentTask ->
-  // println "\t ~ [DEBUG][app] build.gradle - currentTask = ${currentTask.name}..."
-    if (currentTask =~ /generate.+BuildConfig/) {
-        currentTask.finalizedBy(extractAllJars)
-        extractAllJars.finalizedBy(collectAllJars)
-    }
+   // println "\t ~ [DEBUG][app] build.gradle - currentTask = ${currentTask.name} ..."
+
     if (currentTask =~ /compile.+JavaWithJavac/) {
         currentTask.dependsOn(runSbg)
-        runSbg.finalizedBy(buildMetadata)
+    }
+
+    if (currentTask =~ /mergeDex.+/) {
+        currentTask.dependsOn(runSbg)
     }
 
     if (currentTask =~ /compile.+Kotlin.+/) {
         currentTask.dependsOn(runSbg)
-        runSbg.finalizedBy(buildMetadata)
     }
 
     if (currentTask =~ /merge.*Assets/) {
         currentTask.dependsOn(buildMetadata)
     }
-    // ensure buildMetadata is done before R8 to allow custom proguard from metadata
+
+//    // ensure buildMetadata is done before R8 to allow custom proguard from metadata
     if (currentTask =~ /minify.*WithR8/) {
         buildMetadata.finalizedBy(currentTask)
     }
@@ -986,44 +1079,6 @@ tasks.configureEach({ DefaultTask currentTask ->
         cleanupAllJars.dependsOn(currentTask)
     }
 
-    if (currentTask =~ /merge.+Shaders/) {
-        currentTask.dependsOn(runSbg)
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /mergeDex.+/) {
-        currentTask.dependsOn(runSbg)
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /dexBuilder.+/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /extract.+NativeSymbolTables/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /mergeExtDex.+/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /mergeLibDex.+/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /mergeProjectDex.+/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /merge.+NativeLibs/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /sync.+LibJars/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
     if (currentTask.name == "extractProguardFiles") {
         currentTask.finalizedBy(buildMetadata)
     }
@@ -1061,7 +1116,8 @@ tasks.configureEach({ DefaultTask currentTask ->
     }
 
     if (currentTask =~ /generate.*AndroidTestResValues/) {
-        buildMetadata.dependsOn(currentTask)
+      //  buildMetadata.dependsOn(currentTask)
+        currentTask.finalizedBy(buildMetadata)
     }
 
     if (currentTask =~ /generate.*AndroidTestLintModel/) {

package/framework/gradle.properties

@@ -39,7 +39,7 @@ ns_default_google_java_format_version = 1.6
 ns_default_gson_version = 2.10.1
 ns_default_json_version = 20180813
 ns_default_junit_version = 4.13.2
-ns_default_kotlin_version = 2.0.0-RC2
-ns_default_kotlinx_metadata_jvm_version = 2.0.0-RC2
+ns_default_kotlin_version = 2.0.0
+ns_default_kotlinx_metadata_jvm_version = 2.0.0
 ns_default_mockito_core_version = 3.0.0
 ns_default_spotbugs_version = 3.1.12

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nativescript/android",
     "description": "NativeScript for Android using v8",
-    "version": "8.8.0-alpha.6",
+    "version": "8.8.0-alpha.8",
     "repository": {
         "type": "git",
         "url": "https://github.com/NativeScript/android.git"
@@ -18,7 +18,7 @@
         "minSdk": "17",
         "compileSdk": "34",
         "buildTools": "34.0.0",
-        "kotlin": "2.0.0-RC2"
+        "kotlin": "2.0.0"
     },
     "// this gradle key is here for backwards compatibility - we'll phase it out slowly...": "",
     "gradle": {