@nativescript/android 8.2.0-alpha.9 → 8.2.1

package/framework/build.gradle

@@ -11,10 +11,15 @@ import static org.gradle.internal.logging.text.StyledTextOutput.Style
 buildscript {
 
     def initialize = { ->
+        // set up our logger
+        project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
         def userDir = "${rootProject.projectDir}/../.."
         apply from: "$rootDir/gradle-helpers/user_properties_reader.gradle"
         apply from: "$rootDir/gradle-helpers/paths.gradle"
         rootProject.ext.userDefinedGradleProperties = getUserProperties("${getAppResourcesPath(userDir)}/Android")
+
+        loadPropertyFile("$rootDir/additional_gradle.properties")
+        
         if (rootProject.hasProperty("userDefinedGradleProperties")) {
             rootProject.ext.userDefinedGradleProperties.each { entry ->
                 def propertyName = entry.getKey()
@@ -23,7 +28,6 @@ buildscript {
             }
         }
 
-
         // 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()) {
@@ -43,10 +47,6 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
         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")
@@ -99,6 +99,16 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
 
     }
 
+    def applyBeforePluginGradleConfiguration = { ->
+        def appResourcesPath = getAppResourcesPath()
+        def pathToBeforePluginGradle = "$appResourcesPath/Android/before-plugins.gradle"
+        def beforePluginGradle = file(pathToBeforePluginGradle)
+        if (beforePluginGradle.exists()) {
+            outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined configuration from ${beforePluginGradle}"
+            apply from: pathToBeforePluginGradle
+        }
+    }
+    
     def applyBuildScriptConfigurations = { ->
         def absolutePathToAppResources = getAppResourcesPath()
         def pathToBuildScriptGradle = "$absolutePathToAppResources/Android/rootbuildscript.gradle"
@@ -120,10 +130,10 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
 
     initialize()
     applyBuildScriptConfigurations()
+    applyBeforePluginGradleConfiguration()
 
-    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${kotlin_version}"
-    }
-    def computeBuildToolsVersion = { -> project.hasProperty("androidBuildToolsVersion") ? androidBuildToolsVersion : "${ANDRIOD_BUILD_TOOLS_VERSION}"}
+    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" }
+    def computeBuildToolsVersion = { -> project.hasProperty("androidBuildToolsVersion") ? androidBuildToolsVersion : "${NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION}" }
     def kotlinVersion = computeKotlinVersion()
     def androidBuildToolsVersion = computeBuildToolsVersion()
 

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

@@ -1,6 +1,6 @@
-#Sun Jan 31 00:08:10 AST 2021
+#Sat Mar 05 12:37:00 CET 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip

package/framework/gradle-helpers/user_properties_reader.gradle

@@ -1,3 +1,5 @@
+import static org.gradle.internal.logging.text.StyledTextOutput.Style
+
 def GRADLE_PROPERTIES_FILENAME = "gradle.properties"
 
 def getFile = { dir, filename ->
@@ -9,6 +11,28 @@ def getPropertyFile = { dir ->
     return getFile(dir, GRADLE_PROPERTIES_FILENAME)
 }
 
+def loadPropertyFile = { path ->
+    try {
+        if(project.hasProperty("loadedProperties_${path}")) {
+            logger.info "\t + gradle properties already loaded. SKIPPING"
+        } else {
+            logger.info "\t + trying to load gradle properties from \"$path\""
+
+            Properties properties = new Properties()
+            properties.load(new FileInputStream("$path"))
+            properties.each { prop ->
+                logger.info "\t + [$path] setting ${prop.key} = ${prop.value}"
+                project.ext.set(prop.key, prop.value)
+            }
+            project.ext.set("loadedProperties_${path}", true)
+            
+            outLogger.withStyle(Style.SuccessHeader).println "\t + loaded gradle properties from \"$path\""
+        }
+    } catch(Exception ex) {
+        logger.warn "\t + failed to load gradle properties from \"$path\". Error is: ${ex.getMessage()}"
+    }
+}
+
 ext.getUserProperties = { dir ->
     def file = getPropertyFile(dir)
     if (!file) {
@@ -19,4 +43,6 @@ ext.getUserProperties = { dir ->
     properties.load(file.newInputStream())
 
     return properties
-}
+}
+
+ext.loadPropertyFile = loadPropertyFile

package/framework/gradle.properties

@@ -19,28 +19,28 @@ 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
+# Default versions used throughout the gradle configurations
+NS_DEFAULT_BUILD_TOOLS_VERSION=31.0.0
+NS_DEFAULT_COMPILE_SDK_VERSION=31
+NS_DEFAULT_MIN_SDK_VERSION=17
+NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=7.1.2
+
+ns_default_androidx_appcompat_version = 1.4.1
+ns_default_androidx_exifinterface_version = 1.3.3
+ns_default_androidx_fragment_version = 1.4.1
+ns_default_androidx_material_version = 1.5.0
+ns_default_androidx_multidex_version = 2.0.1
+ns_default_androidx_transition_version = 1.4.1
+ns_default_androidx_viewpager_version = 1.0.0
+ns_default_asm_util_version = 7.0
+ns_default_asm_version = 7.0
+ns_default_bcel_version = 6.5.0
+ns_default_commons_io_version = 2.6
+ns_default_google_java_format_version = 1.6
+ns_default_gson_version = 2.9.0
+ns_default_json_version = 20180813
+ns_default_junit_version = 4.13.2
+ns_default_kotlin_version = 1.6.0
+ns_default_kotlinx_metadata_jvm_version = 0.4.2
+ns_default_mockito_core_version = 3.0.0
+ns_default_spotbugs_version = 3.1.12

package/framework/settings.json

@@ -1,5 +1,5 @@
 {
-    "v8Version": "9.2.230.18",
-    "ndkRevision": "22.1.7171670",
+    "v8Version": "8.3.110.9",
+    "ndkRevision": "21.1.6352462",
     "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.2.0-alpha.9",
+    "version": "8.2.1",
     "repository": {
         "type": "git",
         "url": "https://github.com/NativeScript/android-runtime.git"
@@ -10,18 +10,19 @@
         "**/*"
     ],
     "version_info": {
-        "v8": "9.7.106.13",
-        "gradle": "7.0.2",
-        "gradleAndroid": "7.0.4",
-        "ndk": "r22",
-        "ndkApiLevel": "19",
+        "v8": "8.3.110.9",
+        "gradle": "7.4",
+        "gradleAndroid": "7.1.2",
+        "ndk": "r21",
+        "ndkApiLevel": "122",
         "minSdk": "17",
-        "compileSdk": "30",
-        "buildTools": "30.0.2",
+        "compileSdk": "31",
+        "buildTools": "31.0.0",
         "kotlin": "1.6.0"
     },
-    "publishConfig": {
-        "tag": "alpha",
-        "access": "public"
+    "// this gradle key is here for backwards compatibility - we'll phase it out slowly...": "",
+    "gradle": {
+        "version": "7.4",
+        "android": "7.1.2"
     }
 }