feat: commonGradleProperties

rigor789 · rigor789 · commit 77585ad58cce · 2022-03-05T16:45:35.000+01:00
diff --git a/RUNTIME.iml b/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>
diff --git a/build-artifacts/project-template-gradle/app/src/main/AndroidManifest.xml b/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>
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values-v21/colors.xml b/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>
diff --git a/build-artifacts/project-template-gradle/app/src/main/res/values/colors.xml b/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>
diff --git a/build-artifacts/project-template-gradle/gradle.properties b/build-artifacts/project-template-gradle/gradle.properties
@@ -19,28 +19,5 @@ org.gradle.jvmargs=-Xmx16384M
 android.enableJetifier=true
 android.useAndroidX=true
 
-
-BUILD_TOOLS_VERSION=31.0.0
-COMPILE_SDK_VERSION=31
-MIN_SDK_VERSION=19
-ANDRIOD_BUILD_TOOLS_VERSION = 7.0.2
-
-gson_version = 2.8.6
-bcel_version = 6.2
-junit_version = 4.13.2
-mockito_core_version = 3.0.0
-kotlin_version = 1.5.21
-kotlinx_metadata_jvm_version = 0.3.0
-android_x_app_compat_version = 1.3.1
-android_x_material_version = 1.4.0
-android_x_exif_interface_version = 1.3.2
-android_x_view_pager_version = 1.0.0
-android_x_fragment_version = 1.3.6
-android_x_transition_version = 1.4.1
-android_x_multidex_version = 2.0.1
-commons_io_version = 2.6
-spotbugs_version = 3.1.12
-google_java_format_version = 1.6
-json_version = 20180813
-asm_util_version = 7.0
-asm_version = 7.0 
+# Load common gradle properties
+commonPropertiesPath=common.gradle.properties
diff --git a/build.gradle b/build.gradle
@@ -299,6 +299,11 @@ task copyFilesToProjectTemeplate {
             from "$TEST_APP_PATH/build.gradle"
             into "$DIST_FRAMEWORK_PATH"
         }
+        copy {
+            from "$rootDir/gradle.properties"
+            into "$DIST_FRAMEWORK_PATH"
+            rename "gradle.properties", "common.gradle.properties"
+        }
         copy {
             from "$TEST_APP_PATH/gradle-helpers/paths.gradle"
             into "$DIST_FRAMEWORK_PATH/gradle-helpers"
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,26 @@
+# Common gradle properties
+
+BUILD_TOOLS_VERSION=31.0.0
+COMPILE_SDK_VERSION=31
+MIN_SDK_VERSION=17
+ANDRIOD_BUILD_TOOLS_VERSION=7.1.2
+
+gson_version = 2.9.0
+bcel_version = 6.5.0
+junit_version = 4.13.2
+mockito_core_version = 3.0.0
+kotlinx_metadata_jvm_version = 0.4.2
+kotlin_version = 1.6.0
+android_x_app_compat_version = 1.4.1
+android_x_material_version = 1.5.0
+android_x_exif_interface_version = 1.3.3
+android_x_view_pager_version = 1.0.0
+android_x_fragment_version = 1.4.1
+android_x_transition_version = 1.4.1
+android_x_multidex_version = 2.0.1
+commons_io_version = 2.6
+spotbugs_version = 3.1.12
+google_java_format_version = 1.6
+json_version = 20180813
+asm_util_version = 7.0
+asm_version = 7.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/package.json b/package.json
@@ -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"}
 }
diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
@@ -302,6 +302,7 @@ repositories {
 }
 
 dependencies {
+    // println "\t ~ [DEBUG][app] build.gradle - android_x_app_compat_version = ${android_x_app_compat_version}..."
 
     def androidXAppCompatVersion = "${android_x_app_compat_version}"
     if (project.hasProperty("androidXAppCompat")) {
diff --git a/test-app/build-tools/android-dts-generator b/test-app/build-tools/android-dts-generator
@@ -1 +1 @@
-Subproject commit 266adcb3e4a11c74d0e94373000acc117f4b9033
+Subproject commit 6e2739fddeeeb066d7cbbd4fef354145c9eb46ba
diff --git a/test-app/build-tools/android-metadata-generator/build.gradle b/test-app/build-tools/android-metadata-generator/build.gradle
@@ -4,14 +4,15 @@ apply plugin: 'kotlin'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-if(!project.hasProperty("loadedProjectDeps")){
-    Properties projectDeps = new Properties()
-    projectDeps.load(new FileInputStream("$project.rootDir/gradle.properties"))
-    projectDeps.each { prop ->
-        project.ext.set(prop.key, prop.value)
-    }
-    project.ext.loadedProjectDeps = true
-}
+// todo: check if still needed
+// if(!project.hasProperty("loadedProjectDeps")){
+//     Properties projectDeps = new Properties()
+//     projectDeps.load(new FileInputStream("$project.rootDir/gradle.properties"))
+//     projectDeps.each { prop ->
+//         project.ext.set(prop.key, prop.value)
+//     }
+//     project.ext.loadedProjectDeps = true
+// }
 
 buildscript {
     repositories {
@@ -52,6 +53,8 @@ repositories {
 }
 
 dependencies {
+    // println "\t ~ [DEBUG][android-metadata-generator] build.gradle - bcel_version = ${bcel_version}..."
+
     api "org.apache.bcel:bcel:${bcel_version}"
     api "com.google.code.gson:gson:${gson_version}"
     api group: 'org.jetbrains.kotlinx', name: 'kotlinx-metadata-jvm', version: "${kotlinx_metadata_jvm_version}"
diff --git a/test-app/build-tools/static-binding-generator/build.gradle b/test-app/build-tools/static-binding-generator/build.gradle
@@ -3,14 +3,15 @@ apply plugin: 'java-library'
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-if(!project.hasProperty("loadedProjectDeps")){
-    Properties projectDeps = new Properties()
-    projectDeps.load(new FileInputStream("$project.rootDir/gradle.properties"))
-    projectDeps.each { prop ->
-        project.ext.set(prop.key, prop.value)
-    }
-    project.ext.loadedProjectDeps = true
-}
+// todo: check if still needed
+// if(!project.hasProperty("loadedProjectDeps")){
+//     Properties projectDeps = new Properties()
+//     projectDeps.load(new FileInputStream("$project.rootDir/gradle.properties"))
+//     projectDeps.each { prop ->
+//         project.ext.set(prop.key, prop.value)
+//     }
+//     project.ext.loadedProjectDeps = true
+// }
 
 repositories {
     google()
diff --git a/test-app/build-tools/static-binding-generator/runtests.gradle b/test-app/build-tools/static-binding-generator/runtests.gradle
@@ -4,16 +4,15 @@ import java.nio.file.StandardCopyOption
 apply plugin: 'application'
 apply plugin: 'java-library'
 
-
-if(!project.hasProperty("loadedProjectDeps")){
-    Properties projectDeps = new Properties()
-    projectDeps.load(new FileInputStream("$project.rootDir/gradle.properties"))
-    projectDeps.each { prop ->
-        project.ext.set(prop.key, prop.value)
-    }
-    project.ext.loadedProjectDeps = true
-}
-
+// todo: check if still needed
+// if(!project.hasProperty("loadedProjectDeps")){
+//     Properties projectDeps = new Properties()
+//     projectDeps.load(new FileInputStream("$project.rootDir/gradle.properties"))
+//     projectDeps.each { prop ->
+//         project.ext.set(prop.key, prop.value)
+//     }
+//     project.ext.loadedProjectDeps = true
+// }
 
 defaultTasks 'runSbg'
 
@@ -23,6 +22,8 @@ repositories {
 }
 
 dependencies {
+    // println "\t ~ [DEBUG][static-binding-generator] runtests.gradle - asm_version = ${asm_version}..."
+
     api "org.ow2.asm:asm:${asm_version}"
     api "org.ow2.asm:asm-util:${asm_util_version}"
     api "org.apache.bcel:bcel:${bcel_version}"
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -11,6 +11,33 @@ import static org.gradle.internal.logging.text.StyledTextOutput.Style
 buildscript {
 
     def initialize = { ->
+        // set up our logger
+        project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
+
+        try {
+            // Load common properties if there's a commonPropertiesPath set
+            if(project.hasProperty("loadedCommonProperties")) {
+                logger.info "\t + common gradle properties already loaded. SKIPPING"
+            }
+
+            if(project.hasProperty("commonPropertiesPath") && !project.hasProperty("loadedCommonProperties")) {
+                def commonPropertiesPathFull = Paths.get("$rootDir").resolve("$commonPropertiesPath").toRealPath()
+                logger.info "\t + trying to load common gradle properties from \"$commonPropertiesPath\" (resolved to: \"$commonPropertiesPathFull\")"
+
+                Properties commonProperties = new Properties()
+                commonProperties.load(new FileInputStream("$commonPropertiesPathFull"))
+                commonProperties.each { prop ->
+                    logger.info "\t + [common properties] setting ${prop.key} = ${prop.value}"
+                    project.ext.set(prop.key, prop.value)
+                }
+                project.ext.loadedCommonProperties = true
+                
+                outLogger.withStyle(Style.SuccessHeader).println "\t + loaded common gradle properties from \"$commonPropertiesPath\" (resolved to: \"$commonPropertiesPathFull\")"
+            }
+        } catch(Exception ex) {
+            logger.warn "\t + failed to load common gradle properties. Error is: ${ex.getMessage()}"
+        }
+
         def userDir = "${rootProject.projectDir}/../.."
         apply from: "$rootDir/gradle-helpers/user_properties_reader.gradle"
         apply from: "$rootDir/gradle-helpers/paths.gradle"
@@ -43,10 +70,6 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
         project.ext.PLATFORMS_ANDROID = "platforms/android"
         project.ext.USER_PROJECT_ROOT = "$rootDir/../.."
 
-
-
-        project.ext.outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
-
         project.ext.getAppPath = { ->
             def relativePathToApp = "app"
             def nsConfigFile = file("$USER_PROJECT_ROOT/nsconfig.json")
diff --git a/test-app/gradle.properties b/test-app/gradle.properties
@@ -19,38 +19,13 @@ org.gradle.jvmargs=-Xmx1536m
 # Uncomment the following line in order to enable Gradle debugging. 
 # org.gradle.debug=true
 
-
-
-
 android.enableJetifier=true
 android.useAndroidX=true
 useKotlin=true
 gatherAnalyticsData=true
 
-BUILD_TOOLS_VERSION=31.0.0
-COMPILE_SDK_VERSION=31
-MIN_SDK_VERSION=17
-ANDRIOD_BUILD_TOOLS_VERSION=7.1.0
-
-gson_version = 2.8.6
-bcel_version = 6.5.0
-junit_version = 4.13.2
-mockito_core_version = 3.0.0
-kotlinx_metadata_jvm_version = 0.3.0
-kotlin_version = 1.6.0
-android_x_app_compat_version = 1.3.1
-android_x_material_version = 1.4.0
-android_x_exif_interface_version = 1.3.2
-android_x_view_pager_version = 1.0.0
-android_x_fragment_version = 1.3.6
-android_x_transition_version = 1.4.1
-android_x_multidex_version = 2.0.1
-commons_io_version = 2.6
-spotbugs_version = 3.1.12
-google_java_format_version = 1.6
-json_version = 20180813
-asm_util_version = 7.0
-asm_version = 7.0
+# Load common properties from root
+commonPropertiesPath=../gradle.properties
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/test-app/gradle/wrapper/gradle-wrapper.properties b/test-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 12 21:42:57 CEST 2020
+#Sat Mar 05 12:37:00 CET 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
diff --git a/test-app/runtime-binding-generator/build.gradle b/test-app/runtime-binding-generator/build.gradle
@@ -1,8 +1,14 @@
 apply plugin: 'java-library'
 
 dependencies {
-    testImplementation 'junit:junit:4.13.2'
+    // println "\t ~ [DEBUG][runtime-binding-generator] build.gradle - junit_version = ${junit_version}..."
+
+    testImplementation "junit:junit:${junit_version}"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+// Disable compilation tasks as these are compiled *with* the runtime and not separately
+compileJava.enabled = false
+compileTestJava.enabled = false
diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle
@@ -48,8 +48,6 @@ if(!hasNdkDirectory){
 }
 println "Runtime using NDK_PATH: " + NDK_PATH
 
-
-
 android {
 
     compileSdkVersion COMPILE_SDK_VERSION as int
@@ -139,13 +137,16 @@ allprojects {
 }
 
 dependencies {
+    // println "\t ~ [DEBUG][runtime] build.gradle - junit_version = ${junit_version}..."
+
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.0.0'
+    testImplementation "junit:junit:${junit_version}"
+    testImplementation "org.mockito:mockito-core:${mockito_core_version}"
 }
 
 tasks.whenTaskAdded { task ->
     def taskName = task.getName()
+    // println "\t ~ [DEBUG][runtime] build.gradle whenTaskAdded taskName = ${taskName}"
     if (taskName.contains("externalNativeBuildRelease")) {
         setRuntimeCommit.dependsOn(setPackageVersion)
         task.dependsOn(setRuntimeCommit)

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,7 @@ repositories {`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`dependencies {`
	`305`	`+ // println "\t ~ [DEBUG][app] build.gradle - android_x_app_compat_version = ${android_x_app_compat_version}..."`
`305`	`306`
`306`	`307`	`def androidXAppCompatVersion = "${android_x_app_compat_version}"`
`307`	`308`	`if (project.hasProperty("androidXAppCompat")) {`