[runningcode#299] Don't check dependOnAssemble on root project

ivanalvarado · Mar 7, 2023 · 6dd5817 · 6dd5817
1 parent 9068696
commit 6dd5817
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/fladle-plugin/build.gradle.kts b/fladle-plugin/build.gradle.kts
@@ -168,7 +168,6 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).conf
 }
 
 java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(8))
-  }
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
 }
diff --git a/fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt b/fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt
@@ -121,7 +121,7 @@ class FladlePluginDelegate {
         environment(mapOf("GOOGLE_APPLICATION_CREDENTIALS" to config.serviceAccountCredentials.get()))
       }
       dependsOn(writeConfigProps)
-      if (config.dependOnAssemble.isPresent && config.dependOnAssemble.get()) {
+      if (project.name != project.rootProject.name && config.dependOnAssemble.isPresent && config.dependOnAssemble.get()) {
         val testedExtension = requireNotNull(project.extensions.findByType(TestedExtension::class.java)) { "Could not find TestedExtension in ${project.name}" }
         testedExtension.testVariants.configureEach {
           if (testedVariant.isExpectedVariant(config)) {

diff --git a/fladle-plugin/src/main/java/com/osacky/flank/gradle/FulladlePlugin.kt b/fladle-plugin/src/main/java/com/osacky/flank/gradle/FulladlePlugin.kt
@@ -73,11 +73,31 @@ class FulladlePlugin : Plugin<Project> {
 }
 
 fun configureModule(project: Project, flankGradleExtension: FlankGradleExtension) = project.run {
+  val configs = flankGradleExtension.configs
   val fulladleModuleExtension = extensions.findByType(FulladleModuleExtension::class.java) ?: return
   if (!hasAndroidTest) {
     return
   }
 
+  // configs.forEach { config ->
+  //   if (config.dependOnAssemble.isPresent && config.dependOnAssemble.get()) {
+  //     val testedExtension = project.extensions.findByType(TestedExtension::class.java)
+  //     testedExtension?.testVariants?.configureEach {
+  //       if (testedVariant.isExpectedVariant(config)) {
+  //         if (testedVariant.assembleProvider.isPresent) {
+  //           project.tasks.apply {
+  //             dependsOn(testedVariant.assembleProvider)
+  //           }
+  //         }
+  //         if (assembleProvider.isPresent) {
+  //           dependsOn(assembleProvider)
+  //         }
+  //       }
+  //     } ?: println("Could not find TestedExtension in ${project.name}")
+  //   }
+  // }
+
+
   val testedExtension = extensions.findByType(TestedExtension::class.java) ?: return
   // Only configure the first test variant per module.
   // Does anyone test more than one variant per module?

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ androidx-test-rules = "1.2.0"
 junit-version = "4.13.2"
 
 kotlin = "1.6.21"
-agp-version = "4.2.2"
+agp-version = "7.4.1"
 flank-version = "22.10.0"
 
 [libraries]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists