@nativescript/android 8.8.0-alpha.8 → 8.8.0-next.2024-07-02-9768688544

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") ? minSdk : NS_DEFAULT_MIN_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 {
@@ -687,9 +688,13 @@ task 'collectAllJars' {
     }
 }
 
-task copyMetadataFilters(type: Copy) {
-    from "$rootDir/whitelist.mdg", "$rootDir/blacklist.mdg"
-    into "$BUILD_TOOLS_PATH"
+task copyMetadataFilters {
+    outputs.files("$BUILD_TOOLS_PATH/whitelist.mdg", "$BUILD_TOOLS_PATH/blacklist.mdg")
+    // use an explicit copy task here because the copy task itselfs marks the whole built-tools as an output!
+    copy {
+        from file("$rootDir/whitelist.mdg"), file("$rootDir/blacklist.mdg")
+        into "$BUILD_TOOLS_PATH"
+    }
 }
 
 task 'copyMetadata' {
@@ -809,6 +814,81 @@ task buildMetadata(type: BuildToolTask) {
         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
+        }
+
+        def bundleResourcesTaskName = "bundle${buildTypeName}Resources"
+        def bundleResourcesTask = tasks.findByName(bundleResourcesTaskName)
+
+        if (bundleResourcesTask) {
+            dependsOn bundleResourcesTask
+        }
+
     }
 
     dependsOn copyMetadataFilters
@@ -826,7 +906,9 @@ task buildMetadata(type: BuildToolTask) {
     inputs.files("$MDG_JAVA_DEPENDENCIES")
 
     // make MDG aware of whitelist.mdg and blacklist.mdg files
-    inputs.files(project.fileTree(dir: "$rootDir", include: "**/*.mdg"))
+    // inputs.files(project.fileTree(dir: "$rootDir", include: "**/*.mdg"))
+    // use explicit inputs as the above makes the whole build-tools directory an input!
+    inputs.files("$BUILD_TOOLS_PATH/whitelist.mdg", "$BUILD_TOOLS_PATH/blacklist.mdg")
 
     def classesDir = layout.buildDirectory.dir("intermediates/javac").get().asFile
     if (classesDir.exists()) {
@@ -1079,131 +1161,131 @@ tasks.configureEach({ DefaultTask currentTask ->
         cleanupAllJars.dependsOn(currentTask)
     }
 
-    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)
-        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)
+        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/framework/app/src/main/assets/internal/ts_helpers.js

@@ -170,6 +170,8 @@
 	Object.defineProperty(global, "__extends", { value: __extends });
 	Object.defineProperty(global, "__decorate", { value: __decorate });
 
-	global.JavaProxy = JavaProxy;
+	if (!global.__ns__worker) {
+		global.JavaProxy = JavaProxy;
+	}
 	global.Interfaces = Interfaces;
 })()

package/framework/app/src/main/java/com/tns/RuntimeHelper.java

@@ -190,7 +190,7 @@ public final class RuntimeHelper {
                     waitForLiveSync(context);
                 }
 
-                runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
+//                runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
 
                 File javaClassesModule = new File(appDir, "app/tns-java-classes.js");
                 if (javaClassesModule.exists()) {