First run of Gradle 9 support (#300)

* First run of Gradle 9 support

* Update sample app version

* More version upgrades

* Cleanup

* Whoops

* Add logger being passed to project graph

Author: joshafeinberg

.github/workflows/ci_test_and_publish.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Upload Artifacts
         run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel
@@ -60,7 +60,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: '17'
+        java-version: '21'
     - name: Run tests
       uses: reactivecircus/android-emulator-runner@v2
       with:

.github/workflows/sample_app.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
       - name: Build sample
         run: |
           ./gradlew :affectedmoduledetector:publishToMavenLocal

affectedmoduledetector/build.gradle

@@ -9,12 +9,12 @@ plugins {
 apply from: rootProject.file("gradle/jacoco.gradle")
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(21)
 }
 
 jacoco {

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt

@@ -213,7 +213,7 @@ abstract class AffectedModuleDetector(protected val logger: Logger?) {
             )
 
             logger.lifecycle("projects evaluated")
-            val projectGraph = ProjectGraph(rootProject)
+            val projectGraph = ProjectGraph(rootProject, logger.toLogger())
             val dependencyTracker = DependencyTracker(rootProject, logger.toLogger())
             val provider = setupWithParams(rootProject) { spec ->
                 val parameters = spec.parameters
@@ -265,7 +265,8 @@ abstract class AffectedModuleDetector(protected val logger: Logger?) {
         }
 
         internal fun isProjectEnabled(project: Project): Boolean {
-            return project.hasProperty(ENABLE_ARG)
+            val enabledProvider = project.providers.gradleProperty(ENABLE_ARG)
+            return enabledProvider.isPresent && enabledProvider.get() != "false"
         }
 
         private fun getModulesProperty(project: Project): Set<String>? {
@@ -656,7 +657,7 @@ class AffectedModuleDetectorImpl(
     }
 
     private fun findContainingProject(filePath: String): ProjectPath? {
-        return projectGraph.findContainingProject(filePath).also {
+        return projectGraph.findContainingProject(filePath, logger).also {
             logger?.info("search result for $filePath resulted in ${it?.path}")
         }
     }

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/DependencyTracker.kt

@@ -28,37 +28,41 @@ import java.io.Serializable
  * Utility class that traverses all project dependencies and discover which modules depend on each
  * other. This is mainly used by [AffectedModuleDetector] to find out which projects should be run.
  */
-class DependencyTracker(rootProject: Project, logger: Logger?) : Serializable {
-    val dependentList: Map<ProjectPath, Set<ProjectPath>>
+class DependencyTracker(private val rootProject: Project, private val logger: Logger?) : Serializable {
 
-    init {
+    private val dependentList: Map<ProjectPath, Set<ProjectPath>> by lazy {
         val result = mutableMapOf<ProjectPath, MutableSet<ProjectPath>>()
-        val stringBuilder = StringBuilder()
         rootProject.subprojects.forEach { project ->
+            logger?.info("checking ${project.path} for dependencies")
             project.configurations.forEach { config ->
-                config.dependencies.filterIsInstance<ProjectDependency>().forEach {
-                    stringBuilder.append(
-                        "there is a dependency from ${project.path} (${config.name}) to " +
-                            it.dependencyProject.path +
-                            "\n"
-                    )
-                    result.getOrPut(it.dependencyProject.projectPath) { mutableSetOf() }.add(project.projectPath)
-                }
+                logger?.info("checking config ${project.path}/$config for dependencies")
+                config
+                    .dependencies
+                    .filterIsInstance<ProjectDependency>()
+                    .forEach {
+                        logger?.info(
+                            "there is a dependency from ${project.projectPath} to " +
+                                    it.path,
+                        )
+                        result.getOrPut(ProjectPath(it.path)) { mutableSetOf() }
+                            .add(project.projectPath)
+                    }
             }
         }
-        logger?.info(stringBuilder.toString())
-        dependentList = result
+        result
     }
 
     fun findAllDependents(projectPath: ProjectPath): Set<ProjectPath> {
+        logger?.info("finding dependents of $projectPath")
         val result = mutableSetOf<ProjectPath>()
         fun addAllDependents(projectPath: ProjectPath) {
             if (result.add(projectPath)) {
                 dependentList[projectPath]?.forEach(::addAllDependents)
             }
         }
         addAllDependents(projectPath)
-        // the projectPath isn't a dependent of itself
+        logger?.info("dependents of $projectPath is $result")
+        // the project isn't a dependent of itself
         return result.minus(projectPath)
     }
 }

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/ProjectGraph.kt

@@ -70,10 +70,6 @@ class ProjectGraph(project: Project, logger: Logger? = null) : Serializable {
         return rootNode.find(sections, 0, logger)
     }
 
-    fun getRootProjectPath(): ProjectPath? {
-        return rootNode.projectPath
-    }
-
     val allProjects by lazy {
         val result = mutableSetOf<ProjectPath>()
         rootNode.addAllProjectPaths(result)
@@ -109,6 +105,10 @@ class ProjectGraph(project: Project, logger: Logger? = null) : Serializable {
             }
         }
     }
+
+    fun getRootProjectPath(): ProjectPath? {
+        return rootNode.projectPath
+    }
 }
 
 fun Project.getSupportRootFolder(): File = project.rootDir

affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt

@@ -57,11 +57,10 @@ class AffectedModuleDetectorIntegrationTest {
             """buildscript {
                 |   repositories {
                 |       google()
-                |       jcenter()
                 |   }
                 |   dependencies {
-                |       classpath "com.android.tools.build:gradle:7.4.0"
-                |       classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25"
+                |       classpath "com.android.tools.build:gradle:8.6.1"
+                |       classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
                 |   }    
                 |}
                 |plugins {
@@ -70,7 +69,6 @@ class AffectedModuleDetectorIntegrationTest {
                 |allprojects {
                 |   repositories {
                 |       google()
-                |       jcenter()
                 |   }
                 |}""".trimMargin()
         )
@@ -151,11 +149,10 @@ class AffectedModuleDetectorIntegrationTest {
             """buildscript {
                 |   repositories {
                 |       google()
-                |       jcenter()
                 |   }
                 |   dependencies {
-                |       classpath "com.android.tools.build:gradle:7.4.0"
-                |       classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25"
+                |       classpath "com.android.tools.build:gradle:8.6.1"
+                |       classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0"
                 |   }    
                 |}
                 |plugins {
@@ -167,7 +164,6 @@ class AffectedModuleDetectorIntegrationTest {
                 |allprojects {
                 |   repositories {
                 |       google()
-                |       jcenter()
                 |   }
                 |}""".trimMargin()
         )

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.9.25"
+    ext.kotlin_version = "2.2.0"
     repositories {
         google()
         mavenCentral()
@@ -13,7 +13,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath("org.jlleitschuh.gradle:ktlint-gradle:11.4.2")
         classpath("org.jacoco:org.jacoco.core:0.8.10")
-        classpath "com.vanniktech:gradle-maven-publish-plugin:0.19.0"
+        classpath "com.vanniktech:gradle-maven-publish-plugin:0.34.0"
     }
 }
 
@@ -28,8 +28,11 @@ allprojects {
 
 allprojects {
     plugins.withId("com.vanniktech.maven.publish") {
-        mavenPublish {
-            sonatypeHost = "S01"
+        mavenPublishing {
+            // sonatypeHost = "CENTRAL_PORTAL"
+            publishToMavenCentral()
+
+            signAllPublications()
         }
     }
 }

gradle.properties

@@ -22,7 +22,7 @@ kotlin.code.style=official
 
 # POM
 GROUP = com.dropbox.affectedmoduledetector
-VERSION_NAME=0.5.1-SNAPSHOT
+VERSION_NAME=0.6.0-SNAPSHOT
 
 POM_ARTIFACT_ID = affectedmoduledetector
 POM_NAME = Affected Module Detector

gradle/jacoco.gradle

@@ -48,7 +48,7 @@ project.afterEvaluate {
 
         reports {
             xml.required = true
-            xml.destination = file("${buildDir}/reports/jacoco/report.xml")
+            xml.outputLocation = file("${buildDir}/reports/jacoco/report.xml")
             html.required = true
         }
     }