diff options
Diffstat (limited to '.idea')
-rw-r--r-- | .idea/encodings.xml | 7 | ||||
-rw-r--r-- | .idea/gradle.xml | 26 | ||||
-rw-r--r-- | .idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml | 10 | ||||
-rw-r--r-- | .idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_1_0_0_beta_1038.xml (renamed from .idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_0_0_1_SNAPSHOT.xml) | 7 | ||||
-rw-r--r-- | .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml | 12 | ||||
-rw-r--r-- | .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml | 12 | ||||
-rw-r--r-- | .idea/libraries/jansi.xml | 9 | ||||
-rw-r--r-- | .idea/modules.xml | 1 | ||||
-rw-r--r-- | .idea/runConfigurations/All_tests.xml | 6 | ||||
-rw-r--r-- | .idea/runConfigurations/Dokka.xml | 5 | ||||
-rw-r--r-- | .idea/runConfigurations/Stdlib.xml | 7 |
11 files changed, 75 insertions, 27 deletions
diff --git a/.idea/encodings.xml b/.idea/encodings.xml index e206d70d..f7589596 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> -</project> - + <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false"> + <file url="PROJECT" charset="UTF-8" /> + </component> +</project>
\ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 00b45e99..acfc0bba 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,6 +12,11 @@ </set> </option> <option name="useAutoImport" value="true" /> + <option name="myModules"> + <set> + <option value="$PROJECT_DIR$/dokka-fatjar" /> + </set> + </option> </GradleProjectSettings> <GradleProjectSettings> <option name="distributionType" value="DEFAULT_WRAPPED" /> @@ -22,6 +27,27 @@ </set> </option> <option name="useAutoImport" value="true" /> + <option name="myModules"> + <set> + <option value="$PROJECT_DIR$/gradle-plugin" /> + </set> + </option> + </GradleProjectSettings> + <GradleProjectSettings> + <option name="distributionType" value="DEFAULT_WRAPPED" /> + <option name="externalProjectPath" value="$PROJECT_DIR$/javadoc" /> + <option name="gradleJvm" value="1.8" /> + <option name="modules"> + <set> + <option value="$PROJECT_DIR$/javadoc" /> + </set> + </option> + <option name="useAutoImport" value="true" /> + <option name="myModules"> + <set> + <option value="$PROJECT_DIR$/javadoc" /> + </set> + </option> </GradleProjectSettings> <GradleProjectSettings> <option name="distributionType" value="DEFAULT_WRAPPED" /> diff --git a/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml deleted file mode 100644 index 8c78e1dc..00000000 --- a/.idea/libraries/Gradle__org_fusesource_jansi_jansi_1_11.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component name="libraryTable"> - <library name="Gradle: org.fusesource.jansi:jansi:1.11"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/fusesource/jansi/jansi/1.11/jansi-1.11.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_0_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_1_0_0_beta_1038.xml index 1328f8e8..eee2b80d 100644 --- a/.idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_0_0_1_SNAPSHOT.xml +++ b/.idea/libraries/Gradle__org_jetbrains_dokka_dokka_fatjar_1_0_0_beta_1038.xml @@ -1,12 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> <component name="libraryTable"> - <library name="Gradle: org.jetbrains.dokka:dokka-fatjar:0.0.1-SNAPSHOT"> + <library name="Gradle: org.jetbrains.dokka:dokka-fatjar:1.0.0-beta-1038"> <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/dokka/dokka-fatjar/0.0.1-SNAPSHOT/dokka-fatjar-0.0.1-SNAPSHOT.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/dokka/dokka-fatjar/1.0.0-beta-1038/dokka-fatjar-1.0.0-beta-1038.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/dokka/dokka-fatjar/0.0.1-SNAPSHOT/dokka-fatjar-0.0.1-SNAPSHOT-sources.jar!/" /> + <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/dokka/dokka-fatjar/1.0.0-beta-1038/dokka-fatjar-1.0.0-beta-1038-sources.jar!/" /> </SOURCES> </library> </component>
\ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml new file mode 100644 index 00000000..7269fee8 --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component name="libraryTable"> + <library name="Gradle: org.jetbrains.kotlin:kotlin-runtime:0.1-SNAPSHOT"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/0.1-SNAPSHOT/kotlin-runtime-0.1-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-runtime/0.1-SNAPSHOT/kotlin-runtime-0.1-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml new file mode 100644 index 00000000..7ee2d16e --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component name="libraryTable"> + <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT"> + <CLASSES> + <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/0.1-SNAPSHOT/kotlin-stdlib-0.1-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/0.1-SNAPSHOT/kotlin-stdlib-0.1-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> +</component>
\ No newline at end of file diff --git a/.idea/libraries/jansi.xml b/.idea/libraries/jansi.xml new file mode 100644 index 00000000..f191460f --- /dev/null +++ b/.idea/libraries/jansi.xml @@ -0,0 +1,9 @@ +<component name="libraryTable"> + <library name="jansi"> + <CLASSES> + <root url="jar://$PROJECT_DIR$/lib/jansi.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component>
\ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 4b4cbc1b..99b0072e 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -7,6 +7,7 @@ <module fileurl="file://$PROJECT_DIR$/dokka-fatjar/dokka-fatjar.iml" filepath="$PROJECT_DIR$/dokka-fatjar/dokka-fatjar.iml" /> <module fileurl="file://$PROJECT_DIR$/gradle-plugin/dokka-gradle-plugin.iml" filepath="$PROJECT_DIR$/gradle-plugin/dokka-gradle-plugin.iml" /> <module fileurl="file://$PROJECT_DIR$/maven-plugin/dokka-maven-plugin.iml" filepath="$PROJECT_DIR$/maven-plugin/dokka-maven-plugin.iml" /> + <module fileurl="file://$PROJECT_DIR$/javadoc/javadoc.iml" filepath="$PROJECT_DIR$/javadoc/javadoc.iml" /> </modules> </component> </project>
\ No newline at end of file diff --git a/.idea/runConfigurations/All_tests.xml b/.idea/runConfigurations/All_tests.xml index 4e7c9c09..5976ed25 100644 --- a/.idea/runConfigurations/All_tests.xml +++ b/.idea/runConfigurations/All_tests.xml @@ -1,20 +1,20 @@ <component name="ProjectRunConfigurationManager"> <configuration default="false" name="All tests" type="JUnit" factoryName="JUnit" singleton="true"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> + <module name="dokka" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> <option name="PACKAGE_NAME" value="org.jetbrains.dokka.tests" /> <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> <option name="TEST_OBJECT" value="package" /> - <option name="VM_PARAMETERS" value="" /> + <option name="VM_PARAMETERS" value="-ea -Xmx256m" /> <option name="PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> + <value defaultName="moduleWithDependencies" /> </option> <envs /> <patterns /> diff --git a/.idea/runConfigurations/Dokka.xml b/.idea/runConfigurations/Dokka.xml index b752422e..e2388ba2 100644 --- a/.idea/runConfigurations/Dokka.xml +++ b/.idea/runConfigurations/Dokka.xml @@ -1,13 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> <component name="ProjectRunConfigurationManager"> <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.DokkaPackage" /> + <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="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> <option name="PASS_PARENT_ENVS" value="true" /> <module name="dokka" /> <envs /> diff --git a/.idea/runConfigurations/Stdlib.xml b/.idea/runConfigurations/Stdlib.xml index 7750c5df..d29fc0bd 100644 --- a/.idea/runConfigurations/Stdlib.xml +++ b/.idea/runConfigurations/Stdlib.xml @@ -1,13 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> <component name="ProjectRunConfigurationManager"> <configuration default="false" name="Stdlib" type="JetRunConfigurationType" factoryName="Kotlin"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" value="org.jetbrains.dokka.DokkaPackage" /> + <option name="MAIN_CLASS_NAME" value="org.jetbrains.dokka.MainKt" /> <option name="VM_PARAMETERS" value="-Xmx2048m -Xms256m" /> - <option name="PROGRAM_PARAMETERS" value="../kotlin/libraries/stdlib/src ../kotlin/core/builtins ../kotlin/core/reflection -samples ../kotlin/libraries/stdlib/test -output doc -module stdlib -include ../kotlin/libraries/stdlib/src/Module.md -format kotlin-website -srcLink ../kotlin=http://github.com/JetBrains/kotlin/blob/master#L" /> + <option name="PROGRAM_PARAMETERS" value="../kotlin/libraries/stdlib/src ../kotlin/core/builtins ../kotlin/core/reflection.jvm -samples ../kotlin/libraries/stdlib/test -output doc -module stdlib -include ../kotlin/libraries/stdlib/src/Module.md -format kotlin-website -nodeprecated -srcLink ../kotlin=http://github.com/JetBrains/kotlin/blob/master#L" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> <option name="PASS_PARENT_ENVS" value="true" /> <module name="dokka" /> <envs /> |