merge: release/8.2.0 (#1705)

Author: rigor789

RUNTIME.iml

@@ -8,7 +8,7 @@
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml

@@ -21,6 +21,7 @@
         <activity
             android:name="com.tns.NativeScriptActivity"
             android:label="@string/title_activity_kimera"
+            android:exported="true"
             android:configChanges="keyboardHidden|orientation|screenSize">
 
              <intent-filter>

build-artifacts/project-template-gradle/app/src/main/res/values-v21/colors.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="ns_accent">#3d5afe</color>
+	<color name="ns_accent">#65adf1</color>
 </resources>

build-artifacts/project-template-gradle/app/src/main/res/values/colors.xml

@@ -2,5 +2,5 @@
 <resources>
     <color name="ns_primary">#F5F5F5</color>
 	<color name="ns_primaryDark">#757575</color>
-	<color name="ns_accent">#33B5E5</color>
+	<color name="ns_accent">#65adf1</color>
 </resources>

build-artifacts/project-template-gradle/gradle.properties

@@ -16,6 +16,11 @@ import groovy.json.JsonOutput
 
 def onlyX86 = project.hasProperty("onlyX86")
 def useCCache = !project.hasProperty("noCCache")
+def hasNdkVersion = project.hasProperty("ndkVersion")
+
+if (hasNdkVersion) {
+    println "Using NDK version " + ndkVersion
+}
 
 def isWinOs = System.properties['os.name'].toLowerCase().contains('windows')
 def pVersion = "no package version was provided by build.gradle build"
@@ -36,6 +41,11 @@ task checkEnvironmentVariables {
         throw new GradleException("Set ANDROID_HOME to point to the correct Android SDK location\n")
     }
 
+    if ("$System.env.ANDROID_NDK_HOME" == "" || "$System.env.ANDROID_NDK_HOME" == "null" && !project.hasProperty("ndkVersion")) {
+        logger.warn("Warning: The ANDROID_NDK_HOME is not set nor the ndkVersion project property. The build might fail if a ndk cannot be found.\n")
+    }
+
+
     if ("$System.env.GIT_COMMIT" == "null" && !project.hasProperty("gitCommitVersion")) {
         logger.warn("Warning: The GIT_COMMIT is not set. This NativeScript Android Runtime will not be tagged with the git commit it is build from\n")
     }
@@ -185,6 +195,9 @@ def getAssembleReleaseBuildArguments = { ->
     if (useCCache) {
         arguments.add("-PuseCCache")
     }
+    if (hasNdkVersion) {
+        arguments.add("-PndkVersion="+ndkVersion)
+    }
     arguments += ["--warning-mode", "all"]
     return arguments
 }
@@ -286,6 +299,10 @@ task copyFilesToProjectTemeplate {
             from "$TEST_APP_PATH/build.gradle"
             into "$DIST_FRAMEWORK_PATH"
         }
+        copy {
+            from "$TEST_APP_PATH/gradle.properties"
+            into "$DIST_FRAMEWORK_PATH"
+        }
         copy {
             from "$TEST_APP_PATH/gradle-helpers/paths.gradle"
             into "$DIST_FRAMEWORK_PATH/gradle-helpers"

build.gradle

@@ -3,4 +3,4 @@ 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.4-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,18 +1,24 @@
 {
   "name": "@nativescript/android",
   "description": "NativeScript Runtime for Android",
-  "version": "7.0.1",
+  "version": "8.2.0-dev.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/android-runtime.git"
   },
   "files": [
     "**/*"
   ],
-  "gradle": {
-    "version": "6.4",
-    "android": "3.6.4"
+  "version_info":{
+    "v8": "8.3.110.9",
+    "gradle": "7.4",
+    "gradleAndroid": "7.1.2",
+    "ndk": "r21",
+    "ndkApiLevel": "122",
+    "minSdk": "17",
+    "compileSdk": "31",
+    "buildTools":"31.0.0",
+    "kotlin":"1.6.0"
   },
-  "android_ndk_version": "21b",
-  "publishConfig": {"tag":"next", "access": "public"}
+  "publishConfig": {"tag":"alpha", "access": "public"}
 }

package.json

@@ -0,0 +1,15 @@
+# To debug Gradle scripts, you must enable this behaviour with a flag (seen some rows below)
+# Start debugging by initiating a remote Java debug through your IDE on port 5005
+# Beware that Gradle spawns daemons to execute secondary builds. This could be a problem when debugging.
+# You could stop them with "gradle --stop" and run a given task from the console with "gradle some_task_name --no-daemon" 
+# or with "org.gradle.daemon=false" set inside your "~/.gradle/gradle.properties" file.
+# Uncomment the following line in order to enable Gradle debugging. 
+# org.gradle.debug=true
+
+useKotlin=true
+gatherAnalyticsData=true
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true