nativescript 8.1.5 → 8.2.1

package/vendor/gradle-plugin/build.gradle

@@ -1,14 +1,17 @@
 import groovy.json.JsonSlurper
 import org.gradle.internal.logging.text.StyledTextOutputFactory
 import static org.gradle.internal.logging.text.StyledTextOutput.Style
+import java.nio.file.Paths
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
+apply plugin: 'kotlin-parcelize'
 
 buildscript {
-    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.4.21" }
+    def getDepPlatformDir = { dep ->
+        file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
+    }
+    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.6.0" }
     def kotlinVersion = computeKotlinVersion()
     repositories {
         google()
@@ -23,33 +26,62 @@ buildscript {
     }
 
     // Set up styled logger
+    project.ext.getDepPlatformDir = getDepPlatformDir
     project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
 
-    // todo: pass appResourcesPath from CLI as a gradle arg
-    project.ext.getAppResourcesPath = { ->
+    project.ext.USER_PROJECT_ROOT = "$rootDir/../../.."
+    project.ext.PLATFORMS_ANDROID = "platforms/android"
+    project.ext.PLUGIN_NAME = "{{pluginName}}"
+
+    // the build script will not work with previous versions of the CLI (3.1 or earlier)
+    def dependenciesJson = file("${project.ext.USER_PROJECT_ROOT}/${project.ext.PLATFORMS_ANDROID}/dependencies.json")
+    def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
+    def pluginData = appDependencies.find { it.name == project.ext.PLUGIN_NAME }
+    project.ext.nativescriptDependencies = appDependencies.findAll{pluginData.dependencies.contains(it.name)}
+    project.ext.getAppPath = { ->
         def relativePathToApp = "app"
-        def relativePathToAppResources
-        def absolutePathToAppResources
-        def projectRoot = "$rootDir/../../.."
-        def nsConfigFile = file("$projectRoot/nsconfig.json")
+        def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
         def nsConfig
 
         if (nsConfigFile.exists()) {
             nsConfig = new JsonSlurper().parseText(nsConfigFile.getText("UTF-8"))
         }
 
-        if(nsConfig != null && nsConfig.appPath != null){
+        if (project.hasProperty("appPath")) {
+            // when appPath is passed through -PappPath=/path/to/app
+            // the path could be relative or absolute - either case will work
+            relativePathToApp = appPath
+        } else if (nsConfig != null && nsConfig.appPath != null) {
             relativePathToApp = nsConfig.appPath
         }
 
-        if(nsConfig != null && nsConfig.appResourcesPath != null ) {
+        project.ext.appPath = Paths.get(USER_PROJECT_ROOT).resolve(relativePathToApp).toAbsolutePath()
+
+        return project.ext.appPath
+    }
+
+    project.ext.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 (project.hasProperty("appResourcesPath")) {
+            // when appResourcesPath is passed through -PappResourcesPath=/path/to/App_Resources
+            // the path could be relative or absolute - either case will work
+            relativePathToAppResources = 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 {
-            relativePathToAppResources  = "$relativePathToApp/App_Resources"
+            absolutePathToAppResources = "${getAppPath()}/App_Resources"
         }
 
-        absolutePathToAppResources = java.nio.file.Paths.get(projectRoot).resolve(relativePathToAppResources).toAbsolutePath()
-
         project.ext.appResourcesPath = absolutePathToAppResources
 
         return absolutePathToAppResources
@@ -64,6 +96,15 @@ buildscript {
             apply from: pathToBuildScriptGradle, to: buildscript
         }
 
+        nativescriptDependencies.each { dep ->
+            def pathToPluginBuildScriptGradle = "${getDepPlatformDir(dep)}/buildscript.gradle"
+            def pluginBuildScriptGradle = file(pathToPluginBuildScriptGradle)
+            if (pluginBuildScriptGradle.exists()) {
+                outLogger.withStyle(Style.SuccessHeader).println "\t + applying user-defined buildscript from dependency ${pluginBuildScriptGradle}"
+                apply from: pathToPluginBuildScriptGradle, to: buildscript
+            }
+        }
+
         def pathToPluginBuildScriptGradle = "$rootDir/buildscript.gradle"
         def pluginBuildScriptGradle = file(pathToPluginBuildScriptGradle)
         if (pluginBuildScriptGradle.exists()) {
@@ -75,8 +116,19 @@ buildscript {
 
 }
 
+def pluginDependencies
+
 allprojects {
     repositories {
+        // used for local *.AAR files
+        pluginDependencies = nativescriptDependencies.collect {
+            getDepPlatformDir(it)
+        }
+
+        // some plugins may have their android dependencies in a /libs subdirectory
+        pluginDependencies.addAll(nativescriptDependencies.collect {
+            "${getDepPlatformDir(it)}/libs"
+        })
         mavenLocal()
         mavenCentral()
         maven {
@@ -84,44 +136,42 @@ allprojects {
             name 'Google'
         }
         jcenter()
+        if (pluginDependencies.size() > 0) {
+            flatDir {
+                dirs pluginDependencies
+            }
+        }
     }
 }
 
 
-def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 28 }
+def computeCompileSdkVersion = { -> project.hasProperty("compileSdk") ? compileSdk : 31 }
 def computeBuildToolsVersion = { ->
-    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "28.0.3"
+    project.hasProperty("buildToolsVersion") ? buildToolsVersion : "31.0.0"
 }
 
 android {
+    def applyPluginGradleConfigurations = { ->
+        nativescriptDependencies.each { dep ->
+            def includeGradlePath = "${getDepPlatformDir(dep)}/include.gradle"
+            if (file(includeGradlePath).exists()) {
+                apply from: includeGradlePath
+            }
+        }
+    }
     applyBeforePluginGradleConfiguration()
+    applyPluginGradleConfigurations()
 
     compileSdkVersion computeCompileSdkVersion()
     buildToolsVersion computeBuildToolsVersion()
 
     defaultConfig {
-        targetSdkVersion 26
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
 }
 
-dependencies {
-    def supportVer = "28.0.0"
-    if (project.hasProperty("supportVersion")) {
-        supportVer = supportVersion
-    }
-    compileOnly "com.android.support:support-v4:$supportVer"
-    compileOnly "com.android.support:appcompat-v7:$supportVer"
-
-    configurations.all {
-       resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-           if (details.requested.group == "com.android.support" && !details.requested.name.startsWith("multidex")) {
-               details.useVersion supportVer
-           }
-       }
-    }
-}
 
 def applyBeforePluginGradleConfiguration() {
     def appResourcesPath = getAppResourcesPath()
@@ -131,4 +181,47 @@ def applyBeforePluginGradleConfiguration() {
         outLogger.withStyle(Style.SuccessHeader).println "\t ~ applying user-defined configuration from ${beforePluginGradle}"
         apply from: pathToBeforePluginGradle
     }
-}
+}
+
+task addDependenciesFromNativeScriptPlugins {
+    nativescriptDependencies.each { dep ->
+        def aarFiles = fileTree(dir: getDepPlatformDir(dep), include: ["**/*.aar"])
+        aarFiles.each { aarFile ->
+            def length = aarFile.name.length() - 4
+            def fileName = aarFile.name[0..<length]
+            outLogger.withStyle(Style.SuccessHeader).println "\t + adding aar plugin dependency: " + aarFile.getAbsolutePath()
+            project.dependencies.add("implementation", [name: fileName, ext: "aar"])
+        }
+
+        def jarFiles = fileTree(dir: getDepPlatformDir(dep), include: ["**/*.jar"])
+        jarFiles.each { jarFile ->
+            def jarFileAbsolutePath = jarFile.getAbsolutePath()
+            outLogger.withStyle(Style.SuccessHeader).println "\t + adding jar plugin dependency: $jarFileAbsolutePath"
+            pluginsJarLibraries.add(jarFile.getAbsolutePath())
+        }
+
+        project.dependencies.add("implementation", jarFiles)
+    }
+}
+
+afterEvaluate {
+    def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false
+    def generateR =  project.hasProperty("generateR") ? project.generateR : false
+    generateReleaseBuildConfig.enabled = generateBuildConfig
+    generateDebugBuildConfig.enabled = generateBuildConfig
+    generateReleaseResValues.enabled = generateR
+    generateDebugResValues.enabled = generateR
+}
+
+tasks.whenTaskAdded({ DefaultTask currentTask ->
+    if (currentTask.name == 'bundleRelease' || currentTask.name == 'bundleDebug') {
+        def generateBuildConfig =  project.hasProperty("generateBuildConfig") ? project.generateBuildConfig : false
+        def generateR =  project.hasProperty("generateR") ? project.generateR : false
+        if (!generateBuildConfig) {
+            currentTask.exclude '**/BuildConfig.class'
+        }
+        if (!generateR) {
+            currentTask.exclude '**/R.class', '**/R$*.class'
+        }
+    }
+})

package/vendor/gradle-plugin/gradle.properties

@@ -18,3 +18,5 @@ org.gradle.jvmargs=-Xmx16384M
 
 android.enableJetifier=true
 android.useAndroidX=true
+android.nonTransitiveRClass=true
+android.enableSeparateRClassCompilation=true