@nativescript/android 8.8.0-alpha.7 → 8.8.0-alpha.9

package/framework/app/build.gradle

@@ -79,6 +79,7 @@ def allJarLibraries = new LinkedList<String>()
 
 def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
 def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeMinSdkVersion = { -> project.hasProperty("minSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
 def computeBuildToolsVersion = { ->
     project.hasProperty("buildToolsVersion") ? buildToolsVersion : NS_DEFAULT_BUILD_TOOLS_VERSION as String
 }
@@ -217,7 +218,7 @@ android {
 
     defaultConfig {
         def manifest = new XmlSlurper().parse(file(android.sourceSets.main.manifest.srcFile))
-        def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?: NS_DEFAULT_MIN_SDK_VERSION
+        def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?: computeMinSdkVersion()
         minSdkVersion minSdkVer
         targetSdkVersion computeTargetSdkVersion()
         ndk {
@@ -725,6 +726,162 @@ 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
+        }
+
+        def mergeJavaResourceTaskName = "merge${buildTypeName}JavaResource"
+        def mergeJavaResourceTask = tasks.findByName(mergeJavaResourceTaskName)
+
+        if (mergeJavaResourceTask) {
+            dependsOn mergeJavaResourceTask
+        }
+
+        def mergeJniLibFoldersTaskName = "merge${buildTypeName}JniLibFolders"
+        def mergeJniLibFoldersTask = tasks.findByName(mergeJniLibFoldersTaskName)
+
+        if (mergeJniLibFoldersTask) {
+            dependsOn mergeJniLibFoldersTask
+        }
+
+        def mergeNativeLibsTaskName = "merge${buildTypeName}NativeLibs"
+        def mergeNativeLibsTask = tasks.findByName(mergeNativeLibsTaskName)
+
+        if (mergeNativeLibsTask) {
+            dependsOn mergeNativeLibsTask
+        }
+
+        def stripDebugSymbolsTaskName = "strip${buildTypeName}DebugSymbols"
+        def stripDebugSymbolsTask = tasks.findByName(stripDebugSymbolsTaskName)
+
+        if (stripDebugSymbolsTask) {
+            dependsOn stripDebugSymbolsTask
+        }
+
+        def validateSigningTaskName = "validateSigning${buildTypeName}"
+        def validateSigningTask = tasks.findByName(validateSigningTaskName)
+
+        if (validateSigningTask) {
+            dependsOn validateSigningTask
+        }
+
+
+        def extractProguardFilesTaskName = "extractProguardFiles"
+        def extractProguardFilesTask = tasks.findByName(extractProguardFilesTaskName)
+
+        if (extractProguardFilesTask) {
+            dependsOn extractProguardFilesTask
+        }
+
+
+        def compileArtProfileTaskName = "compile${buildTypeName}ArtProfile"
+        def compileArtProfileTask = tasks.findByName(compileArtProfileTaskName)
+
+        if (compileArtProfileTask) {
+            dependsOn compileArtProfileTask
+        }
+
+
+        def extractNativeSymbolTablesTaskName = "extract${buildTypeName}NativeSymbolTables"
+        def extractNativeSymbolTablesTask = tasks.findByName(extractNativeSymbolTablesTaskName)
+
+        if (extractNativeSymbolTablesTask) {
+            dependsOn extractNativeSymbolTablesTask
+        }
+
+
+        def optimizeResourcesTaskName = "optimize${buildTypeName}Resources"
+        def optimizeResourcesTask = tasks.findByName(optimizeResourcesTaskName)
+
+        if (optimizeResourcesTask) {
+            dependsOn optimizeResourcesTask
+        }
+
+
+
+    }
+
     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 +1112,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)
-        currentTask.finalizedBy(buildMetadata)
+    }
+
+    if (currentTask =~ /mergeDex.+/) {
+        currentTask.dependsOn(runSbg)
     }
 
     if (currentTask =~ /compile.+Kotlin.+/) {
         currentTask.dependsOn(runSbg)
-        currentTask.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,168 +1150,131 @@ 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)
-    }
-
+//    if (currentTask.name == "extractProguardFiles") {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
     if (currentTask =~ /generate.+LintVitalReportModel/) {
-        currentTask.finalizedBy(buildMetadata)
+        currentTask.dependsOn(buildMetadata)
     }
 
     if (currentTask =~ /lintVitalAnalyze.+/) {
-        currentTask.mustRunAfter(buildMetadata)
-    }
-
-    if (currentTask =~ /merge.+GlobalSynthetics/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /optimize.+Resources/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /buildCMake.*/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /configureCMake.*/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /validateSigning.*/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /generate.*LintReportModel/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /generate.*AndroidTestResValues/) {
-        buildMetadata.dependsOn(currentTask)
-    }
-
-    if (currentTask =~ /generate.*AndroidTestLintModel/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /generate.*UnitTestLintModel/) {
-        buildMetadata.mustRunAfter(currentTask)
-    }
-
-    if (currentTask =~ /generate.*UnitTestLintModel/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-
-    if (currentTask =~ /lintAnalyze.*UnitTest/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /process.*JavaRes/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /strip.*DebugSymbols/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /merge.*JavaResource/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /lintAnalyze.*/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /lintAnalyze.*AndroidTest/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /bundle.*Resources/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /compile.*ArtProfile/) {
-        currentTask.mustRunAfter(buildMetadata)
-    }
-
-    if (currentTask =~ /check.*DuplicateClasses/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /check.*AarMetadata/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /create.*CompatibleScreenManifests/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /process.*Manifest/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /generate.*ResValues/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /merge.*Resources/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /package.*Resources/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /process.*Resources/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /desugar.*Dependencies/) {
-        currentTask.finalizedBy(buildMetadata)
-    }
-
-    if (currentTask =~ /merge.*JniLibFolders/) {
-        currentTask.finalizedBy(buildMetadata)
+        currentTask.dependsOn(buildMetadata)
     }
+//
+//    if (currentTask =~ /merge.+GlobalSynthetics/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /optimize.+Resources/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /buildCMake.*/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /configureCMake.*/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /validateSigning.*/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /generate.*LintReportModel/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /generate.*AndroidTestResValues/) {
+//      //  buildMetadata.dependsOn(currentTask)
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /generate.*AndroidTestLintModel/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /generate.*UnitTestLintModel/) {
+//        buildMetadata.mustRunAfter(currentTask)
+//    }
+//
+//    if (currentTask =~ /generate.*UnitTestLintModel/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//
+//    if (currentTask =~ /lintAnalyze.*UnitTest/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /process.*JavaRes/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /strip.*DebugSymbols/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /merge.*JavaResource/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /lintAnalyze.*/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /lintAnalyze.*AndroidTest/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /bundle.*Resources/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /compile.*ArtProfile/) {
+//        currentTask.mustRunAfter(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /check.*DuplicateClasses/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /check.*AarMetadata/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /create.*CompatibleScreenManifests/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /process.*Manifest/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /generate.*ResValues/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /merge.*Resources/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /package.*Resources/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /process.*Resources/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /desugar.*Dependencies/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
+//
+//    if (currentTask =~ /merge.*JniLibFolders/) {
+//        currentTask.finalizedBy(buildMetadata)
+//    }
 
 })
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nativescript/android",
     "description": "NativeScript for Android using v8",
-    "version": "8.8.0-alpha.7",
+    "version": "8.8.0-alpha.9",
     "repository": {
         "type": "git",
         "url": "https://github.com/NativeScript/android.git"