diff options
author | Sergey Mashkov <sergey.mashkov@jetbrains.com> | 2015-08-10 14:46:50 +0300 |
---|---|---|
committer | Sergey Mashkov <sergey.mashkov@jetbrains.com> | 2015-08-10 14:51:55 +0300 |
commit | 8216501e9a07940ed0a0be3d204733df9a9d811c (patch) | |
tree | bdf92b7fff16d12086b004861ac26b3439fde021 | |
parent | ff89f37f3a525460d35d4fcaec99afbaec160618 (diff) | |
download | dokka-8216501e9a07940ed0a0be3d204733df9a9d811c.tar.gz dokka-8216501e9a07940ed0a0be3d204733df9a9d811c.tar.bz2 dokka-8216501e9a07940ed0a0be3d204733df9a9d811c.zip |
~ configure javadoc module, configure artifact configuration
-rw-r--r-- | .idea/artifacts/dokka_zip.xml | 2 | ||||
-rw-r--r-- | .idea/artifacts/javadoc_jar.xml | 8 | ||||
-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/kotlin.xml | 1 | ||||
-rw-r--r-- | javadoc/javadoc.iml | 14 | ||||
-rw-r--r-- | javadoc/src/main/resources/dokka/format/javadoc.properties (renamed from javadoc/src/main/resources/format/javadoc.properties) | 0 |
7 files changed, 25 insertions, 24 deletions
diff --git a/.idea/artifacts/dokka_zip.xml b/.idea/artifacts/dokka_zip.xml index 936a2a3c..b636e097 100644 --- a/.idea/artifacts/dokka_zip.xml +++ b/.idea/artifacts/dokka_zip.xml @@ -18,6 +18,8 @@ <element id="library" level="project" name="ant-1.9.4" /> <element id="library" level="project" name="cli-parser" /> <element id="library" level="project" name="guava" /> + <element id="library" level="project" name="com.google.inject:guice:4.0" /> + <element id="artifact" artifact-name="javadoc:jar" /> </element> </element> </root> diff --git a/.idea/artifacts/javadoc_jar.xml b/.idea/artifacts/javadoc_jar.xml new file mode 100644 index 00000000..0f0eee5b --- /dev/null +++ b/.idea/artifacts/javadoc_jar.xml @@ -0,0 +1,8 @@ +<component name="ArtifactManager"> + <artifact type="jar" name="javadoc:jar"> + <output-path>$PROJECT_DIR$/out/artifacts/javadoc_jar</output-path> + <root id="archive" name="javadoc.jar"> + <element id="module-output" name="javadoc" /> + </root> + </artifact> +</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 deleted file mode 100644 index 7269fee8..00000000 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_0_1_SNAPSHOT.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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 deleted file mode 100644 index 7ee2d16e..00000000 --- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_0_1_SNAPSHOT.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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/kotlin.xml b/.idea/libraries/kotlin.xml index a24e595c..7d59a672 100644 --- a/.idea/libraries/kotlin.xml +++ b/.idea/libraries/kotlin.xml @@ -2,6 +2,7 @@ <library name="kotlin"> <CLASSES> <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" /> + <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> diff --git a/javadoc/javadoc.iml b/javadoc/javadoc.iml new file mode 100644 index 00000000..4f38fb20 --- /dev/null +++ b/javadoc/javadoc.iml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="kotlin" level="project" /> + <orderEntry type="module" module-name="dokka" /> + </component> +</module>
\ No newline at end of file diff --git a/javadoc/src/main/resources/format/javadoc.properties b/javadoc/src/main/resources/dokka/format/javadoc.properties index a58317fc..a58317fc 100644 --- a/javadoc/src/main/resources/format/javadoc.properties +++ b/javadoc/src/main/resources/dokka/format/javadoc.properties |