diff options
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/codeStyles/Project.xml | 34 | ||||
| -rw-r--r-- | .idea/compiler.xml | 77 | ||||
| -rw-r--r-- | .idea/jarRepositories.xml | 35 | ||||
| -rw-r--r-- | .idea/kotlinScripting.xml | 2 | ||||
| -rw-r--r-- | .idea/kotlinc.xml | 11 | ||||
| -rw-r--r-- | .idea/misc.xml | 6 |
6 files changed, 54 insertions, 111 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ba49a93e..31d977a0 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,24 +1,26 @@ <component name="ProjectCodeStyleConfiguration"> <code_scheme name="Project" version="173"> <JetCodeStyleSettings> - <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" /> - <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="false" /> - <option name="CONTINUATION_INDENT_FOR_EXPRESSION_BODIES" value="false" /> - <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" /> - <option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" /> - <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="false" /> - <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" /> + <option name="PACKAGES_TO_USE_STAR_IMPORTS"> + <value> + <package name="java.util" alias="false" withSubpackages="false" /> + <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" /> + <package name="io.ktor" alias="false" withSubpackages="true" /> + </value> + </option> + <option name="PACKAGES_IMPORT_LAYOUT"> + <value> + <package name="" alias="false" withSubpackages="true" /> + <package name="java" alias="false" withSubpackages="true" /> + <package name="javax" alias="false" withSubpackages="true" /> + <package name="kotlin" alias="false" withSubpackages="true" /> + <package name="" alias="true" withSubpackages="true" /> + </value> + </option> + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> </JetCodeStyleSettings> <codeStyleSettings language="kotlin"> - <option name="CALL_PARAMETERS_WRAP" value="5" /> - <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> - <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> - <option name="METHOD_PARAMETERS_WRAP" value="5" /> - <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" /> - <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" /> - <option name="EXTENDS_LIST_WRAP" value="1" /> - <option name="METHOD_CALL_CHAIN_WRAP" value="1" /> - <option name="ASSIGNMENT_WRAP" value="1" /> + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> </codeStyleSettings> </code_scheme> </component>
\ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 5d169de7..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="CompilerConfiguration"> - <wildcardResourcePatterns> - <entry name="!?*.java" /> - <entry name="!?*.form" /> - <entry name="!?*.class" /> - <entry name="!?*.groovy" /> - <entry name="!?*.scala" /> - <entry name="!?*.flex" /> - <entry name="!?*.kt" /> - <entry name="!?*.clj" /> - </wildcardResourcePatterns> - <bytecodeTargetLevel> - <module name="android-gradle-plugin_main" target="1.8" /> - <module name="android-gradle-plugin_test" target="1.8" /> - <module name="ant_main" target="1.8" /> - <module name="ant_test" target="1.8" /> - <module name="buildSrc_main" target="1.8" /> - <module name="buildSrc_test" target="1.8" /> - <module name="cli_main" target="1.8" /> - <module name="cli_test" target="1.8" /> - <module name="core_main" target="1.8" /> - <module name="core_test" target="1.8" /> - <module name="dokka.buildSrc.main" target="1.8" /> - <module name="dokka.buildSrc.test" target="1.8" /> - <module name="dokka.core.main" target="1.8" /> - <module name="dokka.core.test" target="1.8" /> - <module name="dokka.integration.main" target="1.8" /> - <module name="dokka.integration.test" target="1.8" /> - <module name="dokka.runners.android-gradle-plugin.main" target="1.8" /> - <module name="dokka.runners.android-gradle-plugin.test" target="1.8" /> - <module name="dokka.runners.ant.main" target="1.8" /> - <module name="dokka.runners.ant.test" target="1.8" /> - <module name="dokka.runners.cli.main" target="1.8" /> - <module name="dokka.runners.cli.test" target="1.8" /> - <module name="dokka.runners.fatjar.main" target="1.8" /> - <module name="dokka.runners.fatjar.test" target="1.8" /> - <module name="dokka.runners.gradle-integration-tests.main" target="1.8" /> - <module name="dokka.runners.gradle-integration-tests.test" target="1.8" /> - <module name="dokka.runners.gradle-plugin.main" target="1.8" /> - <module name="dokka.runners.gradle-plugin.test" target="1.8" /> - <module name="dokka.runners.maven-plugin.main" target="1.8" /> - <module name="dokka.runners.maven-plugin.test" target="1.8" /> - <module name="fatjar_main" target="1.8" /> - <module name="fatjar_test" target="1.8" /> - <module name="gradle-integration-tests_main" target="1.8" /> - <module name="gradle-integration-tests_test" target="1.8" /> - <module name="gradle-plugin_main" target="1.8" /> - <module name="gradle-plugin_test" target="1.8" /> - <module name="integration_main" target="1.8" /> - <module name="integration_test" target="1.8" /> - <module name="maven-plugin_main" target="1.8" /> - <module name="maven-plugin_test" target="1.8" /> - <module name="org.jetbrains.dokka.android-gradle-plugin.main" target="1.8" /> - <module name="org.jetbrains.dokka.android-gradle-plugin.test" target="1.8" /> - <module name="org.jetbrains.dokka.ant.main" target="1.8" /> - <module name="org.jetbrains.dokka.ant.test" target="1.8" /> - <module name="org.jetbrains.dokka.buildSrc.main" target="1.8" /> - <module name="org.jetbrains.dokka.buildSrc.test" target="1.8" /> - <module name="org.jetbrains.dokka.cli.main" target="1.8" /> - <module name="org.jetbrains.dokka.cli.test" target="1.8" /> - <module name="org.jetbrains.dokka.core.main" target="1.8" /> - <module name="org.jetbrains.dokka.core.test" target="1.8" /> - <module name="org.jetbrains.dokka.fatjar.main" target="1.8" /> - <module name="org.jetbrains.dokka.fatjar.test" target="1.8" /> - <module name="org.jetbrains.dokka.gradle-integration-tests.main" target="1.8" /> - <module name="org.jetbrains.dokka.gradle-integration-tests.test" target="1.8" /> - <module name="org.jetbrains.dokka.gradle-plugin.main" target="1.8" /> - <module name="org.jetbrains.dokka.gradle-plugin.test" target="1.8" /> - <module name="org.jetbrains.dokka.integration.main" target="1.8" /> - <module name="org.jetbrains.dokka.integration.test" target="1.8" /> - <module name="org.jetbrains.dokka.maven-plugin.main" target="1.8" /> - <module name="org.jetbrains.dokka.maven-plugin.test" target="1.8" /> - </bytecodeTargetLevel> - </component> -</project>
\ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 664d1ad2..0c589859 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -32,11 +32,6 @@ <option name="url" value="https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/1.3.20-dev-564/maven" /> </remote-repository> <remote-repository> - <option name="id" value="MavenLocal" /> - <option name="name" value="MavenLocal" /> - <option name="url" value="file:$MAVEN_REPOSITORY$/" /> - </remote-repository> - <remote-repository> <option name="id" value="maven7" /> <option name="name" value="maven7" /> <option name="url" value="https://dl.bintray.com/orangy/maven" /> @@ -47,6 +42,11 @@ <option name="url" value="https://dl.bintray.com/jetbrains/markdown" /> </remote-repository> <remote-repository> + <option name="id" value="MavenLocal" /> + <option name="name" value="MavenLocal" /> + <option name="url" value="file:$MAVEN_REPOSITORY$/" /> + </remote-repository> + <remote-repository> <option name="id" value="BintrayJCenter" /> <option name="name" value="BintrayJCenter" /> <option name="url" value="https://jcenter.bintray.com/" /> @@ -76,5 +76,30 @@ <option name="name" value="Google" /> <option name="url" value="https://dl.google.com/dl/android/maven2/" /> </remote-repository> + <remote-repository> + <option name="id" value="maven10" /> + <option name="name" value="maven10" /> + <option name="url" value="https://kotlin.bintray.com/kotlin-plugin" /> + </remote-repository> + <remote-repository> + <option name="id" value="maven6" /> + <option name="name" value="maven6" /> + <option name="url" value="https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/1.3.61/maven" /> + </remote-repository> + <remote-repository> + <option name="id" value="maven" /> + <option name="name" value="maven" /> + <option name="url" value="https://dl.bintray.com/jetbrains/markdown/" /> + </remote-repository> + <remote-repository> + <option name="id" value="maven" /> + <option name="name" value="maven" /> + <option name="url" value="https://dl.bintray.com/kotlin/kotlin-dev/" /> + </remote-repository> + <remote-repository> + <option name="id" value="MavenLocal" /> + <option name="name" value="MavenLocal" /> + <option name="url" value="file:$MAVEN_REPOSITORY$" /> + </remote-repository> </component> </project>
\ No newline at end of file diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml index a6fe551d..bc444dea 100644 --- a/.idea/kotlinScripting.xml +++ b/.idea/kotlinScripting.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="KotlinScriptingSettings"> - <option name="isAutoReloadEnabled" value="true" /> + <option name="suppressDefinitionsCheck" value="true" /> </component> </project>
\ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 38d23597..35cd5ac3 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="Kotlin2JsCompilerArguments"> - <option name="sourceMapEmbedSources" /> - <option name="sourceMapPrefix" /> - </component> <component name="KotlinCommonCompilerArguments"> - <option name="apiVersion" value="1.1" /> - <option name="languageVersion" value="1.2" /> + <option name="apiVersion" value="1.3" /> + <option name="languageVersion" value="1.3" /> + </component> + <component name="KotlinCompilerSettings"> + <option name="additionalArguments" value="-version -Xskip-metadata-version-check" /> </component> </project>
\ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e208459b..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/out" /> - </component> -</project>
\ No newline at end of file |