@nativescript/android 8.0.0 → 8.2.0-alpha.1

package/framework/build.gradle

@@ -1,3 +1,11 @@
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+
+import java.nio.file.Paths
+
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import groovy.json.JsonSlurper
+import static org.gradle.internal.logging.text.StyledTextOutput.Style
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
@@ -14,27 +22,126 @@ buildscript {
                 project.ext.set(propertyName, propertyValue)
             }
         }
+
+
+        // the build script will not work with previous versions of the CLI (3.1 or earlier)
+        def dependenciesJson = file("$rootDir/dependencies.json")
+        if (!dependenciesJson.exists()) {
+            throw new BuildCancelledException("""
+'dependencies.json' file not found. Check whether the NativeScript CLI has prepared the project beforehand,
+and that your NativeScript version is 3.3, or a more recent one. To build an android project with the current
+version of the {N} CLI install a previous version of the runtime package - 'tns platform add android@3.2'.
+""")
+        }
+
+        project.ext.extractedDependenciesDir = "${project.buildDir}/exploded-dependencies"
+        project.ext.cleanupAllJarsTimestamp = "${project.buildDir}/cleanupAllJars.timestamp"
+        project.ext.extractAllJarsTimestamp = "${project.buildDir}/extractAllJars.timestamp"
+
+
+        project.ext.nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text)
+        project.ext.PLATFORMS_ANDROID = "platforms/android"
+        project.ext.USER_PROJECT_ROOT = "$rootDir/../.."
+
+
+
+        project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
+
+        project.ext.getAppPath = { ->
+            def relativePathToApp = "app"
+            def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
+            def nsConfig
+
+            if (nsConfigFile.exists()) {
+                nsConfig = new JsonSlurper().parseText(nsConfigFile.getText("UTF-8"))
+            }
+
+            if (project.hasProperty("appPath")) {
+                // when appPath is passed through -PappPath=/path/to/app
+                // the path could be relative or absolute - either case will work
+                relativePathToApp = appPath
+            } else if (nsConfig != null && nsConfig.appPath != null) {
+                relativePathToApp = nsConfig.appPath
+            }
+
+            project.ext.appPath = Paths.get(USER_PROJECT_ROOT).resolve(relativePathToApp).toAbsolutePath()
+
+            return project.ext.appPath
+        }
+
+        project.ext.getAppResourcesPath = { ->
+            def relativePathToAppResources
+            def absolutePathToAppResources
+            def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
+            def nsConfig
+
+            if (nsConfigFile.exists()) {
+                nsConfig = new JsonSlurper().parseText(nsConfigFile.getText("UTF-8"))
+            }
+
+            if (project.hasProperty("appResourcesPath")) {
+                // when appResourcesPath is passed through -PappResourcesPath=/path/to/App_Resources
+                // the path could be relative or absolute - either case will work
+                relativePathToAppResources = appResourcesPath
+                absolutePathToAppResources = Paths.get(USER_PROJECT_ROOT).resolve(relativePathToAppResources).toAbsolutePath()
+            } else if (nsConfig != null && nsConfig.appResourcesPath != null) {
+                relativePathToAppResources = nsConfig.appResourcesPath
+                absolutePathToAppResources = Paths.get(USER_PROJECT_ROOT).resolve(relativePathToAppResources).toAbsolutePath()
+            } else {
+                absolutePathToAppResources = "${getAppPath()}/App_Resources"
+            }
+
+            project.ext.appResourcesPath = absolutePathToAppResources
+
+            return absolutePathToAppResources
+        }
+
+
     }
+
+    def applyBuildScriptConfigurations = { ->
+        def absolutePathToAppResources = getAppResourcesPath()
+        def pathToBuildScriptGradle = "$absolutePathToAppResources/Android/rootbuildscript.gradle"
+        def buildScriptGradle = file(pathToBuildScriptGradle)
+        if (buildScriptGradle.exists()) {
+            outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined root buildscript from ${buildScriptGradle}"
+            apply from: pathToBuildScriptGradle, to: buildscript
+        }
+
+        nativescriptDependencies.each { dep ->
+            def pathToPluginBuildScriptGradle = "$rootDir/${dep.directory}/$PLATFORMS_ANDROID/rootbuildscript.gradle"
+            def pluginBuildScriptGradle = file(pathToPluginBuildScriptGradle)
+            if (pluginBuildScriptGradle.exists()) {
+                outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined rootbuildscript from dependency ${pluginBuildScriptGradle}"
+                apply from: pathToPluginBuildScriptGradle, to: buildscript
+            }
+        }
+    }
+
     initialize()
+    applyBuildScriptConfigurations()
 
-    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.3.72"
+    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${kotlin_version}"
     }
+    def computeBuildToolsVersion = { -> project.hasProperty("androidBuildToolsVersion") ? androidBuildToolsVersion : "7.0.2"}
     def kotlinVersion = computeKotlinVersion()
+    def androidBuildToolsVersion = computeBuildToolsVersion()
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.4'
+        classpath "com.android.tools.build:gradle:$androidBuildToolsVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.8', ext: 'pom'
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     beforeEvaluate { project ->
         if (rootProject.hasProperty("userDefinedGradleProperties")) {

package/framework/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 12 21:42:57 CEST 2020
+#Sun Jan 31 00:08:10 AST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

package/framework/gradle-helpers/paths.gradle

@@ -1,5 +1,7 @@
 import groovy.json.JsonSlurper
 
+import java.nio.file.Paths
+
 ext.getAppPath = { userDir ->
     def relativePathToApp = "app"
     def nsConfigFile = file("$userDir/nsconfig.json")
@@ -17,7 +19,7 @@ ext.getAppPath = { userDir ->
         relativePathToApp = nsConfig.appPath
     }
 
-    return java.nio.file.Paths.get(userDir).resolve(relativePathToApp).toAbsolutePath()
+    return Paths.get(userDir).resolve(relativePathToApp).toAbsolutePath()
 }
 
 ext.getAppResourcesPath = { userDir ->
@@ -34,10 +36,10 @@ ext.getAppResourcesPath = { userDir ->
         // when appResourcesPath is passed through -PappResourcesPath=/path/to/App_Resources
         // the path could be relative or absolute - either case will work
         relativePathToAppResources = ext.appResourcesPath
-        absolutePathToAppResources = java.nio.file.Paths.get(userDir).resolve(relativePathToAppResources).toAbsolutePath()
+        absolutePathToAppResources = Paths.get(userDir).resolve(relativePathToAppResources).toAbsolutePath()
     } else if (nsConfig != null && nsConfig.appResourcesPath != null) {
         relativePathToAppResources = nsConfig.appResourcesPath
-        absolutePathToAppResources = java.nio.file.Paths.get(userDir).resolve(relativePathToAppResources).toAbsolutePath()
+        absolutePathToAppResources = Paths.get(userDir).resolve(relativePathToAppResources).toAbsolutePath()
     } else {
         absolutePathToAppResources = "${getAppPath(userDir)}/App_Resources"
     }

package/framework/gradle.properties

@@ -18,3 +18,29 @@ org.gradle.jvmargs=-Xmx16384M
 
 android.enableJetifier=true
 android.useAndroidX=true
+
+
+BUILD_TOOLS_VERSION=31.0.0
+COMPILE_SDK_VERSION=31
+MIN_SDK_VERSION=19
+ANDRIOD_BUILD_TOOLS_VERSION = 7.0.2
+
+gson_version = 2.8.6
+bcel_version = 6.2
+junit_version = 4.13.2
+mockito_core_version = 3.0.0
+kotlin_version = 1.5.21
+kotlinx_metadata_jvm_version = 0.3.0
+android_x_app_compat_version = 1.3.1
+android_x_material_version = 1.4.0
+android_x_exif_interface_version = 1.3.2
+android_x_view_pager_version = 1.0.0
+android_x_fragment_version = 1.3.6
+android_x_transition_version = 1.4.1
+android_x_multidex_version = 2.0.1
+commons_io_version = 2.6
+spotbugs_version = 3.1.12
+google_java_format_version = 1.6
+json_version = 20180813
+asm_util_version = 7.0
+asm_version = 7.0

package/framework/settings.json

@@ -1,5 +1,5 @@
 {
-    "v8Version": "8.3.110.9",
-    "ndkRevision": "21.1.6352462",
+    "v8Version": "9.2.230.18",
+    "ndkRevision": "22.1.7171670",
     "mksnapshotParams": "--profile_deserialization --turbo_instruction_scheduling --target_os=android --no-native-code-counters"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nativescript/android",
     "description": "NativeScript Runtime for Android",
-    "version": "8.0.0",
+    "version": "8.2.0-alpha.1",
     "repository": {
         "type": "git",
         "url": "https://github.com/NativeScript/android-runtime.git"
@@ -9,11 +9,16 @@
     "files": [
         "**/*"
     ],
-    "gradle": {
-        "version": "6.4",
-        "android": "3.6.4"
+    "versions": {
+        "v8": "9.2.230.18",
+        "gradle": "7.0.2",
+        "ndk": "r22",
+        "ndkApiLevel": "19",
+        "minSdk": "19",
+        "compileSdk": "31",
+        "buildTools": "31.0.0",
+        "kotlin": "1.5.21"
     },
-    "android_ndk_version": "21b",
     "publishConfig": {
         "tag": "next",
         "access": "public"