@nativescript/android 8.3.2-alpha.1 → 8.4.0-alpha.1

package/framework/app/build.gradle

@@ -35,6 +35,9 @@ import java.util.jar.JarEntry
 import java.util.jar.JarFile
 
 import static org.gradle.internal.logging.text.StyledTextOutput.Style
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 
 apply plugin: "com.android.application"
 apply from: "gradle-helpers/BuildToolTask.gradle"
@@ -77,6 +80,7 @@ def OUTPUT_JAVA_DIR = "$projectDir/src/main/java"
 def MDG_OUTPUT_DIR = "mdg-output-dir.txt"
 def MDG_JAVA_DEPENDENCIES = "mdg-java-dependencies.txt"
 def METADATA_OUT_PATH = "$projectDir/src/main/assets/metadata"
+def METADATA_JAVA_OUT = "mdg-java-out.txt"
 
 // paths to jar libraries
 def pluginsJarLibraries = new LinkedList<String>()
@@ -461,6 +465,13 @@ tasks.whenTaskAdded({ DefaultTask currentTask ->
         currentTask.dependsOn(runSbg)
         currentTask.finalizedBy(buildMetadata)
     }
+
+
+    if (currentTask =~ /compile.+Kotlin.+/) {
+        currentTask.dependsOn(runSbg)
+        currentTask.finalizedBy(buildMetadata)
+    }
+
     if (currentTask =~ /merge.*Assets/) {
         currentTask.dependsOn(buildMetadata)
     }
@@ -706,6 +717,23 @@ task copyMetadata {
     }
 }
 
+def listf(String directoryName, ArrayList<File> store) {
+    def directory = new File(directoryName);
+
+    def resultList = new ArrayList<File>();
+
+    def fList = directory.listFiles();
+    resultList.addAll(Arrays.asList(fList));
+    for (File file : fList) {
+        if (file.isFile()) {
+            store.add(file)
+        } else if (file.isDirectory()) {
+            resultList.addAll(listf(file.getAbsolutePath(), store))
+        }
+    }
+    return resultList
+}
+
 task buildMetadata(type: BuildToolTask) {
     if (!findProject(':android-metadata-generator').is(null)) {
         dependsOn ':android-metadata-generator:jar'
@@ -767,6 +795,19 @@ task buildMetadata(type: BuildToolTask) {
             }
         }
 
+        def store = new ArrayList<File>()
+        for (String dir: generatedClasses){
+            listf(dir, store)
+        }
+
+
+        new File("$BUILD_TOOLS_PATH/$METADATA_JAVA_OUT").withWriter { out ->
+            store.each {
+                out.println it.absolutePath
+            }
+        }
+
+
         new File("$BUILD_TOOLS_PATH/$MDG_OUTPUT_DIR").withWriter { out ->
             out.println "$METADATA_OUT_PATH"
         }
@@ -890,6 +931,7 @@ task cleanSbg(type: Delete) {
             "$BUILD_TOOLS_PATH/$SBG_BINDINGS_NAME",
             "$BUILD_TOOLS_PATH/$SBG_INPUT_FILE",
             "$BUILD_TOOLS_PATH/$SBG_OUTPUT_FILE",
+            "$BUILD_TOOLS_PATH/$METADATA_JAVA_OUT",
             "$OUTPUT_JAVA_DIR/com/tns/gen"
 }
 

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

@@ -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-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

package/framework/gradle.properties

@@ -20,17 +20,15 @@ android.enableJetifier=true
 android.useAndroidX=true
 
 # Default versions used throughout the gradle configurations
-NS_DEFAULT_BUILD_TOOLS_VERSION=31.0.0
-NS_DEFAULT_COMPILE_SDK_VERSION=31
+NS_DEFAULT_BUILD_TOOLS_VERSION=32.0.0
+NS_DEFAULT_COMPILE_SDK_VERSION=32
 NS_DEFAULT_MIN_SDK_VERSION=17
-NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=7.1.2
+NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=7.3.0
 
-# we're defaulting to 1.3.1 instead of 1.4.0+ due to an issue where a newer
-# version pulls in API29+ apis and freezes the app on the Splash Screen.
-ns_default_androidx_appcompat_version = 1.3.1
+ns_default_androidx_appcompat_version = 1.5.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_fragment_version = 1.5.3
+ns_default_androidx_material_version = 1.6.1
 ns_default_androidx_multidex_version = 2.0.1
 ns_default_androidx_transition_version = 1.4.1
 ns_default_androidx_viewpager_version = 1.0.0
@@ -42,7 +40,7 @@ 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_kotlin_version = 1.7.10
 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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nativescript/android",
     "description": "NativeScript Runtime for Android",
-    "version": "8.3.2-alpha.1",
+    "version": "8.4.0-alpha.1",
     "repository": {
         "type": "git",
         "url": "https://github.com/NativeScript/android-runtime.git"
@@ -11,18 +11,18 @@
     ],
     "version_info": {
         "v8": "8.3.110.9",
-        "gradle": "7.4",
-        "gradleAndroid": "7.1.2",
+        "gradle": "7.5",
+        "gradleAndroid": "7.3.0",
         "ndk": "r21",
         "ndkApiLevel": "22",
         "minSdk": "17",
-        "compileSdk": "31",
-        "buildTools": "31.0.0",
-        "kotlin": "1.6.0"
+        "compileSdk": "32",
+        "buildTools": "32.0.0",
+        "kotlin": "1.7.10"
     },
     "// this gradle key is here for backwards compatibility - we'll phase it out slowly...": "",
     "gradle": {
-        "version": "7.4",
-        "android": "7.1.2"
+        "version": "7.5",
+        "android": "7.3."
     }
 }