Merge remote-tracking branch 'origin/master'

elifarley · Jan 2, 2020 · c10da41 · c10da41
2 parents 19db5ec + 95ab146
commit c10da41
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+# https://EditorConfig.org
+# top-most EditorConfig file
+root = true
+
+[*]
+insert_final_newline=true
+
+[*.{kt,kts}]
+# See https://github.com/pinterest/ktlint/issues/527
+# See https://youtrack.jetbrains.com/issue/KT-10974
+disabled_rules=import-ordering
+
+# possible values: number (e.g. 120) (package name, imports & comments are ignored), "off"
+# it's automatically set to 100 on `ktlint --android ...` (per Android Kotlin Style Guide)
+max_line_length=off
diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml
diff --git a/pom.xml b/pom.xml
@@ -54,6 +54,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <kotlin.code.style>official</kotlin.code.style>
         <dokka.version>0.10.0</dokka.version>
         <kotlin.version>1.3.50</kotlin.version>
         <kotlin.compiler.languageVersion>1.3</kotlin.compiler.languageVersion>