fix detection of android kotlin source directories in AGP >= 7

increase maximum gradle version to 8.5
increase maximum ktlint version to 1.1.0
increase maximum kotlin version to 1.9.21
fix lint failures

fixes #702
based on work in #703

fix bashisms by manually specifying correct version of libdistro-info-perl

Author: wakingrufus

.editorconfig

@@ -10,6 +10,7 @@ indent_size = 4
 ij_kotlin_packages_to_use_import_on_demand = unset
 ij_kotlin_name_count_to_use_star_import = 999
 ij_kotlin_name_count_to_use_star_import_for_members = 999
+ktlint_code_style=intellij_idea
 
 [*.{yml,yaml}]
 indent_size = 2

.github/workflows/build-and-check.yml

@@ -101,8 +101,12 @@ jobs:
         with:
           java-version: 11
           distribution: 'zulu'
+      - name: update apt
+        run: sudo apt update
       - name: Install lintian
         run: sudo apt install -qq lintian=2.114.0ubuntu1.3
+      - name: Install libdistro
+        run: sudo apt install -qq libdistro-info-perl
       - name: Install checkbashisms
         run: sudo apt-get install -qq devscripts
       - name: Restore Gradle caches

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+-   fix detection of android kotlin source directories in AGP >= 7 [#733](https://github.com/JLLeitschuh/ktlint-gradle/pull/733)
+
 ## [12.0.3] - 2023-12-11
 
 -   fix: apply configuration for source sets and targets that are added after the plugin is

README.md

@@ -70,6 +70,8 @@ Minimal supported [Kotlin](https://kotlinlang.org) version: `1.4`
 
 Minimal supported [ktlint](https://github.com/pinterest/ktlint) version: `0.47.1`
 
+Minimal supported [Android Gradle plugin](https://developer.android.com/build) version: `4.1.0`
+
 ### Ktlint plugin
 
 #### Simple setup

plugin/.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{kt,kts}]
+indent_size = 4
+ij_kotlin_packages_to_use_import_on_demand = unset
+ij_kotlin_name_count_to_use_star_import = 999
+ij_kotlin_name_count_to_use_star_import_for_members = 999
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ktlint_code_style=intellij_idea
+
+[*.{yml,yaml}]
+indent_size = 2

plugin/VERSION_LATEST_RELEASE.txt

@@ -1 +1 @@
-11.6.1
+12.0.3

plugin/build.gradle.kts

@@ -30,6 +30,10 @@ java {
     }
 }
 
+ktlint {
+    version = "1.1.0"
+}
+
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         // target 1.4 as ktlint 0.49 requires it for inline classes
@@ -56,6 +60,7 @@ configurations {
 }
 configurations["compileOnly"].extendsFrom(shadowImplementation)
 configurations["testImplementation"].extendsFrom(shadowImplementation)
+
 sourceSets {
     val adapter by creating {
     }
@@ -88,13 +93,15 @@ sourceSets {
             runtimeClasspath = adapters.map { it.output }.fold(runtimeClasspath) { a, b -> a + b }
         }
     }
+
     val test by getting {
         kotlin {
             compileClasspath = adapters.map { it.output }.fold(compileClasspath) { a, b -> a + b }
             runtimeClasspath = adapters.map { it.output }.fold(runtimeClasspath) { a, b -> a + b }
         }
     }
 }
+
 val adapterSources = listOf(
     sourceSets.named("adapter"),
     sourceSets.named("adapter47"),
@@ -140,12 +147,6 @@ dependencies {
     // Explicitly added for shadow plugin to relocate implementation as well
     shadowImplementation(libs.slf4j.nop)
 
-    /*
-     * Do not depend upon the gradle script kotlin plugin API. IE: gradleScriptKotlinApi()
-     * It's currently in flux and has binary breaking changes in gradle 4.0
-     * https://github.com/JLLeitschuh/ktlint-gradle/issues/9
-     */
-
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.assertj.core)
     testImplementation(libs.kotlin.reflect)
@@ -165,12 +166,8 @@ kotlin {
     }
 }
 
-// Test tasks loods plugin from local maven repository
-tasks.named<Test>("test") {
-    dependsOn("publishToMavenLocal")
-}
-
 tasks.withType<Test> {
+    dependsOn("publishToMavenLocal")
     useJUnitPlatform()
     maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
     doFirst {
@@ -195,6 +192,12 @@ tasks.withType<Test> {
             maxFailures.set(10)
         }
     }
+
+    javaLauncher.set(
+        javaToolchains.launcherFor {
+            languageVersion = JavaLanguageVersion.of(JavaVersion.current().majorVersion)
+        }
+    )
 }
 
 val relocateShadowJar = tasks.register<ConfigureShadowRelocation>("relocateShadowJar")
@@ -273,7 +276,9 @@ fun setupPublishingEnvironment() {
 
     if (System.getProperty(keyProperty) == null || System.getProperty(secretProperty) == null) {
         logger
-            .info("`$keyProperty` or `$secretProperty` were not set. Attempting to configure from environment variables")
+            .info(
+                "`$keyProperty` or `$secretProperty` were not set. Attempting to configure from environment variables"
+            )
 
         val key: String? = System.getenv(keyEnvironmentVariable)
         val secret: String? = System.getenv(secretEnvironmentVariable)

plugin/src/adapter/kotlin/org/jlleitschuh/gradle/ktlint/reporter/ReportersLoaderAdapter.kt

@@ -12,7 +12,8 @@ interface ReportersLoaderAdapter<
     R,
     RP : Serializable,
     GR : GenericReporter<R>,
-    GRP : GenericReporterProvider<GR>> {
+    GRP : GenericReporterProvider<GR>
+    > {
     fun loadAllReporterProviders(): List<ReporterProviderWrapper<RP>>
     fun filterEnabledBuiltInProviders(
         enabledReporters: Set<ReporterType>,

plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/GitHook.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ConstPropertyName")
+
 package org.jlleitschuh.gradle.ktlint
 
 import org.eclipse.jgit.lib.RepositoryBuilder

plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPlugin.kt

@@ -29,7 +29,7 @@ open class KtlintPlugin : Plugin<Project> {
     private fun PluginHolder.addKtLintTasksToKotlinPlugin() {
         target.plugins.withId("kotlin", applyKtLint())
         target.plugins.withId("org.jetbrains.kotlin.js", applyKtLint())
-        target.plugins.withId("kotlin-android", applyKtLintToAndroid())
+        target.plugins.withId("org.jetbrains.kotlin.android", applyKtLintToAndroid())
         target.plugins.withId(
             "org.jetbrains.kotlin.multiplatform",
             applyKtlintMultiplatform()