@nativescript/android 8.2.0-alpha.9 → 8.2.0-rc.0

package/framework/app/build.gradle

@@ -82,11 +82,11 @@ def METADATA_OUT_PATH = "$projectDir/src/main/assets/metadata"
 def pluginsJarLibraries = new LinkedList<String>()
 def allJarLibraries = new LinkedList<String>()
 
-def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${kotlin_version}" }
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : COMPILE_SDK_VERSION as int }
-def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : COMPILE_SDK_VERSION as int }
+def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "${ns_default_kotlin_version}" }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
+def computeTargetSdkVersion = { -> project.hasProperty("targetSdk") ? targetSdk : NS_DEFAULT_COMPILE_SDK_VERSION as int }
 def computeBuildToolsVersion = { ->
-    project.hasProperty("buildToolsVersion") ? buildToolsVersion : BUILD_TOOLS_VERSION as String
+    project.hasProperty("buildToolsVersion") ? buildToolsVersion : NS_DEFAULT_BUILD_TOOLS_VERSION as String
 }
 
 def enableAnalytics = (project.hasProperty("gatherAnalyticsData") && project.gatherAnalyticsData == "true")
@@ -198,7 +198,7 @@ android {
 
     defaultConfig {
         def manifest = new XmlSlurper().parse(file(android.sourceSets.main.manifest.srcFile))
-        def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?: MIN_SDK_VERSION
+        def minSdkVer = manifest."uses-sdk"."@android:minSdkVersion".text() ?: NS_DEFAULT_MIN_SDK_VERSION
         minSdkVersion minSdkVer
         targetSdkVersion computeTargetSdkVersion()
         ndk {
@@ -298,48 +298,50 @@ repositories {
             dirs pluginDependencies
         }
     }
+    
     mavenCentral()
 }
 
 dependencies {
+    // println "\t ~ [DEBUG][app] build.gradle - ns_default_androidx_appcompat_version = ${ns_default_androidx_appcompat_version}..."
 
-    def androidXAppCompatVersion = "${android_x_app_compat_version}"
+    def androidXAppCompatVersion = "${ns_default_androidx_appcompat_version}"
     if (project.hasProperty("androidXAppCompat")) {
         androidXAppCompatVersion = androidXAppCompat
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.appcompat:appcompat:$androidXAppCompatVersion"
     }
 
-    def androidXMaterialVersion = "${android_x_material_version}"
+    def androidXMaterialVersion = "${ns_default_androidx_material_version}"
     if (project.hasProperty("androidXMaterial")) {
         androidXMaterialVersion = androidXMaterial
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library com.google.android.material:material:$androidXMaterialVersion"
     }
 
-    def androidXExifInterfaceVersion = "${android_x_exif_interface_version}"
+    def androidXExifInterfaceVersion = "${ns_default_androidx_exifinterface_version}"
     if (project.hasProperty("androidXExifInterface")) {
         androidXExifInterfaceVersion = androidXExifInterface
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
     }
 
-    def androidXViewPagerVersion = "${android_x_view_pager_version}"
+    def androidXViewPagerVersion = "${ns_default_androidx_viewpager_version}"
     if (project.hasProperty("androidXViewPager")) {
         androidXViewPagerVersion = androidXViewPager
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
     }
 
-    def androidXFragmentVersion = "${android_x_fragment_version}"
+    def androidXFragmentVersion = "${ns_default_androidx_fragment_version}"
     if (project.hasProperty("androidXFragment")) {
         androidXFragmentVersion = androidXFragment
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.fragment:fragment:$androidXFragmentVersion"
     }
 
-    def androidXTransitionVersion = "${android_x_transition_version}"
+    def androidXTransitionVersion = "${ns_default_androidx_transition_version}"
     if (project.hasProperty("androidXTransition")) {
         androidXTransitionVersion = androidXTransition
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.transition:transition:$androidXTransitionVersion"
     }
 
-    def androidXMultidexVersion = "${android_x_multidex_version}"
+    def androidXMultidexVersion = "${ns_default_androidx_multidex_version}"
     if (project.hasProperty("androidXMultidex")) {
         androidXMultidexVersion = androidXMultidex
         outLogger.withStyle(Style.SuccessHeader).println "\t + using android X library androidx.multidex:multidex:$androidXMultidexVersion"
@@ -347,7 +349,7 @@ dependencies {
 
     implementation "androidx.multidex:multidex:$androidXMultidexVersion"
     implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
-    implementation "com.google.android.material:material:$androidXMaterialVersion"
+    debugImplementation "com.google.android.material:material:$androidXMaterialVersion"
     implementation "androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
     implementation "androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
     //noinspection KtxExtensionAvailable
@@ -462,6 +464,10 @@ tasks.whenTaskAdded({ DefaultTask currentTask ->
     if (currentTask =~ /merge.*Assets/) {
         currentTask.dependsOn(buildMetadata)
     }
+    // ensure buildMetadata is done before R8 to allow custom proguard from metadata
+    if (currentTask =~ /minify.*WithR8/) {
+        currentTask.dependsOn(buildMetadata)
+    }
     if (currentTask =~ /assemble.*Debug/ || currentTask =~ /assemble.*Release/) {
         currentTask.finalizedBy("validateAppIdMatch")
     }

package/framework/app/src/debug/java/com/tns/ErrorReport.java

@@ -156,8 +156,7 @@ class ErrorReport implements TabLayout.OnTabSelectedListener {
     static void startPendingErrorActivity(Context context, Intent intent) throws CanceledException {
         int flags = PendingIntent.FLAG_CANCEL_CURRENT;
         if (Build.VERSION.SDK_INT >= 31) {
-            int FLAG_MUTABLE = 1<<25;
-            flags = PendingIntent.FLAG_CANCEL_CURRENT | FLAG_MUTABLE;
+            flags = PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE;
         }
 
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, flags);

package/framework/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>

package/framework/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>

package/framework/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>