Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ projectName = custom-project
version = 1.0-SNAPSHOT

ideaExtPluginVersion = 1.4.1
spotlessVersion = 8.10.3
spotlessVersion = 8.10.4
typescriptGeneratorVersion = 4.2.1
10 changes: 5 additions & 5 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ pluginManagement {
resolutionStrategy {
eachPlugin {
if (requested.id.id ==
'io.openremote.com.cherryperry.gradle-file-encrypt') {
'io.openremote.com.cherryperry.gradle-file-encrypt') {
useModule(
"com.github.openremote:GradleFileEncrypt:${requested.version}"
)
)
}
}
}
Expand Down Expand Up @@ -50,7 +50,7 @@ fileTree(
.filter { !new File(it.parentFile, ".buildignore").exists() }
.each {
include it.parentFile.canonicalPath
.replace(rootDir.canonicalPath, "")
.replace("\\", ":")
.replace("/", ":")
.replace(rootDir.canonicalPath, "")
.replace("\\", ":")
.replace("/", ":")
}
14 changes: 7 additions & 7 deletions spotless.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Map<String, String> devDependencies =
}
Map<String, String> eslintDependencies = devDependencies.findAll { String name, String ignored ->
name == 'eslint' ||
name == 'typescript' ||
name.startsWith('@typescript-eslint/') ||
name.startsWith('eslint-config-') ||
name.startsWith('eslint-plugin-')
name == 'typescript' ||
name.startsWith('@typescript-eslint/') ||
name.startsWith('eslint-config-') ||
name.startsWith('eslint-plugin-')
}
['eslint', 'prettier', 'typescript'].each { String dependency ->
if (!devDependencies.containsKey(dependency)) {
Expand All @@ -32,9 +32,9 @@ String prettierVersion = devDependencies.prettier

def readIgnorePatterns = { File ignoreFile ->
List<String> patterns = ignoreFile
.readLines('UTF-8')
.collect { it.trim() }
.findAll { it && !it.startsWith('#') }
.readLines('UTF-8')
.collect { it.trim() }
.findAll { it && !it.startsWith('#') }
List<String> unsupported = patterns.findAll {
it.startsWith('!') || it.startsWith('/') || it.contains('\\')
}
Expand Down
Loading