diff --git a/gradle.properties b/gradle.properties index a3e57b012..c0c370453 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/settings.gradle b/settings.gradle index 56a022a2c..542817b3e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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}" - ) + ) } } } @@ -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("/", ":") } diff --git a/spotless.gradle b/spotless.gradle index f166075a6..7f32a891f 100644 --- a/spotless.gradle +++ b/spotless.gradle @@ -16,10 +16,10 @@ Map devDependencies = } Map 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)) { @@ -32,9 +32,9 @@ String prettierVersion = devDependencies.prettier def readIgnorePatterns = { File ignoreFile -> List patterns = ignoreFile - .readLines('UTF-8') - .collect { it.trim() } - .findAll { it && !it.startsWith('#') } + .readLines('UTF-8') + .collect { it.trim() } + .findAll { it && !it.startsWith('#') } List unsupported = patterns.findAll { it.startsWith('!') || it.startsWith('/') || it.contains('\\') }