Revert "fix(gradle): change checkouts directory"

This reverts commit 6a8893a5aa.
This commit is contained in:
Harsh Shandilya 2022-11-19 17:32:06 +05:30
parent f7b4f4383c
commit a10ba38950
No known key found for this signature in database
3 changed files with 4 additions and 7 deletions

3
.gitignore vendored
View file

@ -242,6 +242,3 @@ hs_err_pid*
!/gradle/wrapper/gradle-wrapper.jar !/gradle/wrapper/gradle-wrapper.jar
# End of https://www.toptal.com/developers/gitignore/api/androidstudio,gradle,intellij+all # End of https://www.toptal.com/developers/gitignore/api/androidstudio,gradle,intellij+all
# Directory for checkouts of projects built by includegit-gradle-plugin
/checkouts/

View file

@ -26,18 +26,18 @@ class SpotlessPlugin : Plugin<Project> {
kotlin { kotlin {
ktfmt(KTFMT_VERSION).googleStyle() ktfmt(KTFMT_VERSION).googleStyle()
target("**/*.kt") target("**/*.kt")
targetExclude("**/build/", "/spotless/", "/checkouts/") targetExclude("**/build/", "/spotless/")
licenseHeaderFile(project.file("spotless/license.kt")) licenseHeaderFile(project.file("spotless/license.kt"))
} }
kotlinGradle { kotlinGradle {
ktfmt(KTFMT_VERSION).googleStyle() ktfmt(KTFMT_VERSION).googleStyle()
target("**/*.kts") target("**/*.kts")
targetExclude("**/build/", "/checkouts/") targetExclude("**/build/")
licenseHeaderFile(project.file("spotless/license.kt"), "import|plugins|@file") licenseHeaderFile(project.file("spotless/license.kt"), "import|plugins|@file")
} }
format("xml") { format("xml") {
target("**/*.xml") target("**/*.xml")
targetExclude("**/build/", ".idea/", "/checkouts/") targetExclude("**/build/", ".idea/")
trimTrailingWhitespace() trimTrailingWhitespace()
indentWithSpaces() indentWithSpaces()
endWithNewline() endWithNewline()

View file

@ -55,7 +55,7 @@ pluginManagement {
plugins { id("me.champeau.includegit") version "0.1.5" } plugins { id("me.champeau.includegit") version "0.1.5" }
gitRepositories { gitRepositories {
checkoutsDirectory.set(rootProject.projectDir.resolve("checkouts")) checkoutsDirectory.set(rootProject.projectDir.resolve("build/checkouts"))
include("whetstone") { include("whetstone") {
uri.set("https://github.com/msfjarvis/whetstone") uri.set("https://github.com/msfjarvis/whetstone")
branch.set("inject-component-activity") branch.set("inject-component-activity")