@nativescript/android 8.4.0-dev.0 → 8.4.0-dev.2

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

@@ -0,0 +1,2 @@
+package com.tns;public class Benchmarker {
+}

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

@@ -162,7 +162,7 @@ public final class RuntimeHelper {
                         appDir, classLoader, dexDir, dexThumb, appConfig, isDebuggable);
 
                 runtime = Runtime.initializeRuntimeWithConfiguration(config);
-//                if (isDebuggable) {
+                if (isDebuggable) {
 //                    try {
 //                        v8Inspector = new AndroidJsV8Inspector(context.getFilesDir().getAbsolutePath(), context.getPackageName());
 //                        v8Inspector.start();
@@ -198,10 +198,10 @@ public final class RuntimeHelper {
 //
 //                    // if app is in debuggable mode run livesync service
 //                    // runtime needs to be initialized before the NativeScriptSyncService is enabled because it uses runtime.runScript(...)
-//                    initLiveSync(runtime, logger, context);
-//
-//                    waitForLiveSync(context);
-//                }
+                    initLiveSync(runtime, logger, context);
+
+                    waitForLiveSync(context);
+                }
 
                 runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
 

package/framework/gradle.properties

@@ -20,9 +20,9 @@ android.enableJetifier=true
 android.useAndroidX=true
 
 # Default versions used throughout the gradle configurations
-NS_DEFAULT_BUILD_TOOLS_VERSION=32.0.0
-NS_DEFAULT_COMPILE_SDK_VERSION=32
-NS_DEFAULT_MIN_SDK_VERSION=21
+NS_DEFAULT_BUILD_TOOLS_VERSION=33.0.0
+NS_DEFAULT_COMPILE_SDK_VERSION=33
+NS_DEFAULT_MIN_SDK_VERSION=17
 NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=7.3.0
 
 ns_default_androidx_appcompat_version = 1.5.1

package/framework/settings.gradle

@@ -5,3 +5,74 @@ include ':app'//, ':runtime', ':runtime-binding-generator'
 //project(':runtime-binding-generator').projectDir = new File("${System.env.ANDROID_RUNTIME_HOME}/test-app/runtime-binding-generator")
 
 file("google-services.json").renameTo(file("./app/google-services.json"))
+
+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
+
+def USER_PROJECT_ROOT = "$rootDir/../../"
+def outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
+def ext  = {
+    appResourcesPath = getProperty("appResourcesPath")
+    appPath = getProperty("appPath")
+}
+
+def 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 (ext.appPath) {
+          // when appPath is passed through -PappPath=/path/to/app
+          // the path could be relative or absolute - either case will work
+          relativePathToApp = ext.appPath
+      } else if (nsConfig != null && nsConfig.appPath != null) {
+          relativePathToApp = nsConfig.appPath
+      }
+
+      return Paths.get(USER_PROJECT_ROOT).resolve(relativePathToApp).toAbsolutePath()
+  }
+
+
+def 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 (ext.appResourcesPath) {
+        // 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 = 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"
+    }
+    return absolutePathToAppResources
+}
+
+def applySettingsGradleConfiguration = { ->
+        def appResourcesPath = getAppResourcesPath()
+        def pathToSettingsGradle = "$appResourcesPath/Android/settings.gradle"
+        def settingsGradle = file(pathToSettingsGradle)
+        if (settingsGradle.exists()) {
+            outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined configuration from ${settingsGradle}"
+            apply from: pathToSettingsGradle
+        }
+}
+
+applySettingsGradleConfiguration()

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nativescript/android",
     "description": "NativeScript Runtime for Android",
-    "version": "8.4.0-dev.0",
+    "version": "8.4.0-dev.2",
     "repository": {
         "type": "git",
         "url": "https://github.com/NativeScript/android-runtime.git"
@@ -15,7 +15,7 @@
         "gradleAndroid": "7.3.0",
         "ndk": "r21",
         "ndkApiLevel": "22",
-        "minSdk": "21",
+        "minSdk": "17",
         "compileSdk": "32",
         "buildTools": "32.0.0",
         "kotlin": "1.7.10"