chore: tasks

test-app/app/build.gradle

@@ -963,15 +963,15 @@ tasks.configureEach({ DefaultTask currentTask ->
  }
 
  if (currentTask =~ /merge.+Shaders/) {
- currentTask.dependsOn buildMetadata
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /mergeDex.+/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /dexBuilder.+/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /mergeExtDex.+/) {
@@ -999,23 +999,23 @@ tasks.configureEach({ DefaultTask currentTask ->
  }
 
  if (currentTask =~ /generate.+LintVitalReportModel/) {
- currentTask.dependsOn buildMetadata
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /lintVitalAnalyze.+/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /extract.+NativeSymbolTables/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /merge.+GlobalSynthetics/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /optimize.+Resources/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /buildCMake.*/) {
@@ -1031,19 +1031,19 @@ tasks.configureEach({ DefaultTask currentTask ->
  }
 
  if (currentTask =~ /generate.*LintReportModel/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask.name.contains(":runtime:configureCMakeRelWithDebInfo")) {
  currentTask.finalizedBy(buildMetadata)
  }
 
  if (currentTask =~ /generate.*AndroidTestResValues/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /generate.*AndroidTestLintModel/) {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /generate.*UnitTestLintModel/) {
@@ -1076,7 +1076,7 @@ tasks.configureEach({ DefaultTask currentTask ->
  }
 
  if (currentTask.name == "lintAnalyzeDebug" || currentTask.name == "lintAnalyzeRelease") {
- currentTask.dependsOn(buildMetadata)
+ buildMetadata.finalizedBy(currentTask)
  }
 
  if (currentTask =~ /bundle.*Resources/) {

test-app/build-tools/static-binding-generator/build.gradle

@@ -35,6 +35,10 @@ compileJava {
  targetCompatibility = JavaVersion.VERSION_17
 }
 
+configurations.create("staticBindingGeneratorTestImplementation") {
+ extendsFrom configurations.testImplementation
+ setCanBeResolved(true)
+}
 
 configurations.create("staticBindingGeneratorImplementation") {
  extendsFrom configurations.implementation
@@ -53,12 +57,18 @@ configurations.create("staticBindingGeneratorApi") {
 
 jar {
 
+ configurations.api.setCanBeResolved(true)
+
  manifest {
  attributes("Manifest-Version": "2.0",
  "Main-Class": "org.nativescript.staticbindinggenerator.Main")
  }
  from {
 
+ configurations.staticBindingGeneratorTestImplementation.collect {
+ it.isDirectory() ? it : zipTree(it)
+ }
+
  configurations.staticBindingGeneratorImplementation.collect {
  it.isDirectory() ? it : zipTree(it)
  }

test-app/build-tools/static-binding-generator/runtests.gradle

@@ -73,6 +73,6 @@ task runSbg(type: JavaExec, dependsOn: 'prepareInputFiles') {
  main = "org.nativescript.staticbindinggenerator.Main"
 }
 java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
 }

test-app/runtime-binding-generator/build.gradle

@@ -6,8 +6,8 @@ dependencies {
  testImplementation "junit:junit:${ns_default_junit_version}"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 // Disable compilation tasks as these are compiled *with* the runtime and not separately
 compileJava.enabled = false

test-app/runtime/build.gradle

@@ -159,11 +159,10 @@ dependencies {
  testImplementation "org.mockito:mockito-core:${ns_default_mockito_core_version}"
 }
 
-def buildMetadata = tasks.findByPath(":app:buildMetadata")
 
-tasks.whenTaskAdded { task ->
+tasks.configureEach { task ->
  def taskName = task.getName()
-  // println "\t ~ [DEBUG][runtime] build.gradle whenTaskAdded taskName = ${taskName}"
+ //  println "\t ~ [DEBUG][runtime] build.gradle whenTaskAdded taskName = ${taskName}"
  if (taskName.contains("preReleaseBuild")) {
  setRuntimeCommit.dependsOn(setPackageVersion)
  task.dependsOn(setRuntimeCommit)
@@ -184,80 +183,57 @@ tasks.whenTaskAdded { task ->
  task.dependsOn(":app:cleanupAllJars")
  }
 
- if (taskName.contains("configureCMakeRelWithDebInfo")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ if (task =~ /configureCMake.*/) {
+ task.finalizedBy(":app:buildMetadata")
  }
 
- if (taskName.contains("buildCMakeRelWithDebInfo")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ if (task =~ /buildCMake.*/) {
+ task.finalizedBy(":app:buildMetadata")
  }
 
  if (taskName.contains("syncReleaseLibJars") || taskName.contains("syncDebugLibJars")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
  if (taskName.contains("mergeReleaseJniLibFolders") || taskName.contains("mergeDebugJniLibFolders")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
  if (taskName.contains("mergeReleaseShaders") || taskName.contains("mergeDebugShaders")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
  if (taskName.contains("packageReleaseAssets") || taskName.contains("packageDebugAssets")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
  if (taskName.contains("copyReleaseJniLibsProjectOnly") || taskName.contains("copyDebugJniLibsProjectOnly")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
  if (taskName.contains("copyReleaseJniLibsProjectAndLocalJars") || taskName.contains("copyDebugJniLibsProjectAndLocalJars")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
-
  if (taskName.contains("generateReleaseLintVitalModel") || taskName.contains("generateDebugLintVitalModel")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
-
  if (taskName.contains("lintVitalAnalyzeRelease") || taskName.contains("lintVitalAnalyzeDebug")) {
- if(buildMetadata != null){
- buildMetadata.dependsOn task
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
  if (task =~ /bundleLibRuntimeToDir.*/) {
- if(buildMetadata != null){
- task.finalizedBy(buildMetadata)
- }
+ task.finalizedBy(":app:buildMetadata")
  }
 
-
-
+ if (task =~ /lintAnalyze.+AndroidTest/ ) {
+ task.finalizedBy(":app:buildMetadata")
+ }
 
 }
 
-task setPackageVersion {
+tasks.register('setPackageVersion') {
  onlyIf {
  project.hasProperty('packageVersion')
  }
@@ -272,7 +248,7 @@ task setPackageVersion {
  }
 }
 
-task setRuntimeCommit {
+tasks.register('setRuntimeCommit') {
  onlyIf {
  project.hasProperty('gitCommitVersion')
  }
@@ -287,7 +263,7 @@ task setRuntimeCommit {
  }
 }
 
-task revertVersionFile(type: Exec) {
+tasks.register('revertVersionFile', Exec) {
  onlyIf {
  project.hasProperty('packageVersion') || project.hasProperty('gitCommitVersion')
  }