Merge branch 'main' into dependabot/npm_and_yarn/octokit/request-erro…

…r-5.1.1
evva-sfw · Feb 19, 2025 · 65c0b60 · 65c0b60
2 parents 21d284d + e9d2667
commit 65c0b60
Show file tree

Hide file tree

Showing 14 changed files with 325 additions and 308 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,15 +8,21 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[Makefile]
-indent_size = 4
+[*.java]
+ij_java_imports_layout = $*, |, javax.**, java.**, |, *
 
-[*.gradle]
+[{*.gradle,*.kt,*.kts}]
 indent_size = 4
 
 [{*.json,*.jschema}]
 indent_size = 4
 
 [*.md]
 max_line_length = off
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_size = 4
+
+[*.swift]
+indent_size = 4