diff options
author | KrystianUjma <kujma@virtuslab.com> | 2019-05-28 11:51:33 +0200 |
---|---|---|
committer | KrystianUjma <kujma@virtuslab.com> | 2019-05-28 11:51:33 +0200 |
commit | 218e7b9bd9b40c7216755f20f5a604b4c37b75d7 (patch) | |
tree | 555a4d92f02c95d8c59177645b157b80433d5a47 /.idea/compiler.xml | |
parent | 6dedccb91b4bb3018b32159551b3862fedb7f230 (diff) | |
parent | ec2dfa898b4cf2613ca15cd959a43f4f590005d3 (diff) | |
download | dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.tar.gz dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.tar.bz2 dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.zip |
Merge branch 'dev' of git://github.com/Xerus2000/dokka into Xerus2000-dev
update .gitignore and .idea
# Conflicts:
# .idea/compiler.xml
# .idea/kotlinc.xml
# .idea/modules.xml
# core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
# core/src/main/kotlin/Java/JavadocParser.kt
# core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt
# core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
# core/src/main/kotlin/Model/DocumentationReference.kt
# core/src/main/kotlin/Model/PackageDocs.kt
# core/src/main/kotlin/Model/SourceLinks.kt
# core/src/main/kotlin/Utilities/DokkaModules.kt
# core/src/main/kotlin/Utilities/ServiceLocator.kt
# core/src/main/kotlin/javadoc/docbase.kt
# core/src/test/kotlin/format/HtmlFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteRunnableSamplesFormatTest.kt
# core/src/test/kotlin/issues/IssuesTest.kt
Diffstat (limited to '.idea/compiler.xml')
-rw-r--r-- | .idea/compiler.xml | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..fb727eec --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,65 @@ +<?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> + <annotationProcessing> + <profile name="Maven default annotation processors profile" enabled="true"> + <sourceOutputDir name="target/generated-sources/annotations" /> + <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> + <outputRelativeToContentRoot value="true" /> + <module name="dokka-maven-plugin" /> + </profile> + </annotationProcessing> + <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="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 |