diff --git a/.gitignore b/.gitignore index 9cc8d1fb..aeb599a8 100644 --- a/.gitignore +++ b/.gitignore @@ -242,6 +242,3 @@ hs_err_pid* !/gradle/wrapper/gradle-wrapper.jar # End of https://www.toptal.com/developers/gitignore/api/androidstudio,gradle,intellij+all - -# Directory for checkouts of projects built by includegit-gradle-plugin -/checkouts/ diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt index 7fdfce0d..d4821ef9 100644 --- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt +++ b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt @@ -26,18 +26,18 @@ class SpotlessPlugin : Plugin { kotlin { ktfmt(KTFMT_VERSION).googleStyle() target("**/*.kt") - targetExclude("**/build/", "/spotless/", "/checkouts/") + targetExclude("**/build/", "/spotless/") licenseHeaderFile(project.file("spotless/license.kt")) } kotlinGradle { ktfmt(KTFMT_VERSION).googleStyle() target("**/*.kts") - targetExclude("**/build/", "/checkouts/") + targetExclude("**/build/") licenseHeaderFile(project.file("spotless/license.kt"), "import|plugins|@file") } format("xml") { target("**/*.xml") - targetExclude("**/build/", ".idea/", "/checkouts/") + targetExclude("**/build/", ".idea/") trimTrailingWhitespace() indentWithSpaces() endWithNewline() diff --git a/settings.gradle.kts b/settings.gradle.kts index 407c1122..5bb0192d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -55,7 +55,7 @@ pluginManagement { plugins { id("me.champeau.includegit") version "0.1.5" } gitRepositories { - checkoutsDirectory.set(rootProject.projectDir.resolve("checkouts")) + checkoutsDirectory.set(rootProject.projectDir.resolve("build/checkouts")) include("whetstone") { uri.set("https://github.com/msfjarvis/whetstone") branch.set("inject-component-activity")