diff options
| -rw-r--r-- | .idea/codeStyles/Project.xml | 24 | ||||
| -rw-r--r-- | .idea/codeStyles/codeStyleConfig.xml | 5 | ||||
| -rw-r--r-- | .idea/compiler.xml | 13 | ||||
| -rw-r--r-- | .idea/inspectionProfiles/Project_Default.xml | 7 | ||||
| -rw-r--r-- | .idea/kotlinc.xml | 6 | ||||
| -rw-r--r-- | .idea/misc.xml | 10 | ||||
| -rw-r--r-- | .idea/runConfigurations/All_tests.xml | 4 | ||||
| -rw-r--r-- | .idea/runConfigurations/Core_tests.xml | 39 | ||||
| -rw-r--r-- | .idea/runConfigurations/Dokka.xml | 4 | ||||
| -rw-r--r-- | .idea/runConfigurations/Gradle_integration_tests.xml | 39 | ||||
| -rw-r--r-- | .idea/runConfigurations/Playground.xml | 9 |
11 files changed, 94 insertions, 66 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..ba49a93e --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,24 @@ +<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" /> + </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" /> + </codeStyleSettings> + </code_scheme> +</component>
\ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ +<component name="ProjectCodeStyleConfiguration"> + <state> + <option name="USE_PER_PROJECT_SETTINGS" value="true" /> + </state> +</component>
\ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 56269ff5..9700d3cc 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -22,14 +22,14 @@ <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.6" /> - <module name="ant_test" target="1.6" /> + <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.6" /> - <module name="cli_test" target="1.6" /> - <module name="core_main" target="1.6" /> - <module name="core_test" target="1.6" /> + <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="fatjar_main" target="1.8" /> <module name="fatjar_test" target="1.8" /> <module name="gradle-integration-tests_main" target="1.8" /> @@ -38,7 +38,6 @@ <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" target="1.5" /> <module name="maven-plugin_main" target="1.8" /> <module name="maven-plugin_test" target="1.8" /> </bytecodeTargetLevel> diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 710a3bbe..06bda8c9 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,12 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> <component name="InspectionProjectProfileManager"> <profile version="1.0"> <option name="myName" value="Project Default" /> - <option name="myLocal" value="true" /> - <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false"> - <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" /> - <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" /> - </inspection_tool> + <inspection_tool class="MemberVisibilityCanPrivate" enabled="false" level="WEAK WARNING" enabled_by_default="false" /> <inspection_tool class="PackageDirectoryMismatch" enabled="false" level="WARNING" enabled_by_default="false" /> </profile> </component>
\ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 1c24f9a8..b072dc00 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,7 +1,11 @@ <?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="languageVersion" value="1.1" /> <option name="apiVersion" value="1.1" /> + <option name="languageVersion" value="1.1" /> </component> </project>
\ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9ec5f45a..537aa8e4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,10 +5,12 @@ <groovy codeStyle="LEGACY" /> </component> <component name="EntryPointsManager"> - <entry_points version="2.0" /> - <list size="2"> + <list size="5"> <item index="0" class="java.lang.String" itemvalue="org.apache.maven.plugins.annotations.Mojo" /> - <item index="1" class="java.lang.String" itemvalue="org.gradle.api.tasks.TaskAction" /> + <item index="1" class="java.lang.String" itemvalue="org.gradle.api.tasks.InputFiles" /> + <item index="2" class="java.lang.String" itemvalue="org.gradle.api.tasks.OutputDirectory" /> + <item index="3" class="java.lang.String" itemvalue="org.gradle.api.tasks.TaskAction" /> + <item index="4" class="java.lang.String" itemvalue="org.junit.BeforeClass" /> </list> </component> <component name="FrameworkDetectionExcludesConfiguration"> @@ -23,7 +25,7 @@ </list> </option> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/out" /> </component> </project>
\ No newline at end of file diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml index d0d60ec9..dffc1e09 100644 --- a/.idea/runConfigurations/All_tests.xml +++ b/.idea/runConfigurations/All_tests.xml @@ -1,7 +1,7 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="All tests" type="CompoundRunConfigurationType" factoryName="Compound Run Configuration"> - <toRun type="JUnit" name="Core tests" /> - <toRun type="JUnit" name="Gradle integration tests" /> + <toRun type="GradleRunConfiguration" name="Core tests" /> + <toRun type="GradleRunConfiguration" name="Gradle integration tests" /> <method /> </configuration> </component>
\ No newline at end of file diff --git a/.idea/runConfigurations/Core_tests.xml b/.idea/runConfigurations/Core_tests.xml index 6f76e23f..50476737 100644 --- a/.idea/runConfigurations/Core_tests.xml +++ b/.idea/runConfigurations/Core_tests.xml @@ -1,26 +1,21 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="Core tests" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="core_test" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" value="" /> - <option name="METHOD_NAME" value="" /> - <option name="TEST_OBJECT" value="directory" /> - <option name="VM_PARAMETERS" value="" /> - <option name="PARAMETERS" value="" /> - <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/core/" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <dir value="$PROJECT_DIR$/core/src/test/kotlin" /> - <patterns> - <pattern testClass="org.jetbrains.dokka.gradle.*" /> - </patterns> + <configuration default="false" name="Core tests" type="GradleRunConfiguration" factoryName="Gradle"> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list> + <option value=":core:cleanTest" /> + <option value=":core:test" /> + </list> + </option> + <option name="vmOptions" value="" /> + </ExternalSystemSettings> <method /> </configuration> </component>
\ No newline at end of file diff --git a/.idea/runConfigurations/Dokka.xml b/.idea/runConfigurations/Dokka.xml index a77f9eb3..1f7da97f 100644 --- a/.idea/runConfigurations/Dokka.xml +++ b/.idea/runConfigurations/Dokka.xml @@ -1,9 +1,9 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="Dokka" type="KotlinRunConfigurationType" factoryName="Kotlin" singleton="true"> + <configuration default="false" name="Dokka" type="JetRunConfigurationType" factoryName="Kotlin" singleton="true"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" value="org.jetbrains.dokka.MainKt" /> <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="src/ -output doc -module dokka -format kotlin-website -classpath "$KOTLIN_BUNDLED$/lib/kotlin-compiler.jar:$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar"" /> + <option name="PROGRAM_PARAMETERS" value="core/src -output doc -module dokka -format javadoc -classpath "$KOTLIN_BUNDLED$/lib/kotlin-compiler.jar:$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar"" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> diff --git a/.idea/runConfigurations/Gradle_integration_tests.xml b/.idea/runConfigurations/Gradle_integration_tests.xml index 20af8f96..9589199f 100644 --- a/.idea/runConfigurations/Gradle_integration_tests.xml +++ b/.idea/runConfigurations/Gradle_integration_tests.xml @@ -1,26 +1,21 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="Gradle integration tests" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="gradle-integration-tests_test" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" value="" /> - <option name="METHOD_NAME" value="" /> - <option name="TEST_OBJECT" value="pattern" /> - <option name="VM_PARAMETERS" value="" /> - <option name="PARAMETERS" value="" /> - <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/runners/gradle-integration-tests" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <dir value="$PROJECT_DIR$/core/src/test/kotlin" /> - <patterns> - <pattern testClass="org.jetbrains.dokka.gradle.*" /> - </patterns> + <configuration default="false" name="Gradle integration tests" type="GradleRunConfiguration" factoryName="Gradle"> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list> + <option value=":runners:gradle-integration-tests:cleanTest" /> + <option value=":runners:gradle-integration-tests:test" /> + </list> + </option> + <option name="vmOptions" value="" /> + </ExternalSystemSettings> <method /> </configuration> </component>
\ No newline at end of file diff --git a/.idea/runConfigurations/Playground.xml b/.idea/runConfigurations/Playground.xml new file mode 100644 index 00000000..8322447c --- /dev/null +++ b/.idea/runConfigurations/Playground.xml @@ -0,0 +1,9 @@ +<component name="ProjectRunConfigurationManager"> + <configuration default="false" name="Playground" type="Application" factoryName="Application"> + <option name="MAIN_CLASS_NAME" value="org.jetbrains.dokka.MainKt" /> + <module name="fatjar_main" /> + <option name="PROGRAM_PARAMETERS" value="-module playground test -format html -output out/html" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <method /> + </configuration> +</component>
\ No newline at end of file |