Skip to content

Commit 95ab696

Browse files
authored
Change convention for .editorconfig location (#33)
1 parent 95ac335 commit 95ab696

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.code-style-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
}
2323

2424
val codeStyleConvention = extensions.create<CodeStyleConvention>("codeStyleConvention")
25-
codeStyleConvention.editorConfigPath.convention("$rootDir/build-logic/.editorconfig")
25+
codeStyleConvention.editorConfigPath.convention(layout.settingsDirectory.file("build-logic/common/.editorconfig"))
2626

2727
val kotlinGradleDelimiter = "(package|import|plugins|pluginManagement|dependencyResolutionManagement|repositories) "
2828
val licenseHeaderFileName = if (project.path.startsWith(":private:")) "private/LICENSE_HEADER_PRIVATE" else "LICENSE_HEADER"

gradle-modules/src/main/kotlin/org/sonarsource/cloudnative/gradle/CodeStyleConvention.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.sonarsource.cloudnative.gradle
1818

19-
import org.gradle.api.provider.Property
19+
import org.gradle.api.file.RegularFileProperty
2020

2121
interface CodeStyleConvention {
22-
val editorConfigPath: Property<String>
22+
val editorConfigPath: RegularFileProperty
2323
}

0 commit comments

Comments
 (0)