diff options
| author | KrystianUjma <kujma@virtuslab.com> | 2019-03-19 11:34:38 +0100 |
|---|---|---|
| committer | KrystianUjma <kujma@virtuslab.com> | 2019-03-19 15:56:01 +0100 |
| commit | 2e94ac4098d9e2582223485b981114fa462e5757 (patch) | |
| tree | ed1b772bce9d790c473b346bcce435e893b29be7 | |
| parent | b566f8852e94f9a17be86bf845aeff6c36bd8378 (diff) | |
| parent | a9c91cb7dc54c1554be5cf8de90516c929c0c1cb (diff) | |
| download | dokka-2e94ac4098d9e2582223485b981114fa462e5757.tar.gz dokka-2e94ac4098d9e2582223485b981114fa462e5757.tar.bz2 dokka-2e94ac4098d9e2582223485b981114fa462e5757.zip | |
Merge branch 'kotlin-website-jonnyzzz' into multiplatform-support
90 files changed, 3373 insertions, 1917 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..1c119d95 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +gradlew binary +gradlew.bat binary
\ No newline at end of file @@ -1,3 +1,6 @@ +.idea/ +*.ipr +*.iml doc ### Maven template diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index c8bb43f2..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -dokka
\ No newline at end of file diff --git a/.idea/artifacts/dokka_jar.xml b/.idea/artifacts/dokka_jar.xml deleted file mode 100644 index 5998df7b..00000000 --- a/.idea/artifacts/dokka_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ -<component name="ArtifactManager"> - <artifact type="jar" name="dokka:jar"> - <output-path>$PROJECT_DIR$/out/artifacts/</output-path> - <root id="archive" name="dokka.jar"> - <element id="module-output" name="dokka" /> - <element id="module-output" name="ant" /> - </root> - </artifact> -</component>
\ No newline at end of file diff --git a/.idea/artifacts/dokka_zip.xml b/.idea/artifacts/dokka_zip.xml deleted file mode 100644 index b636e097..00000000 --- a/.idea/artifacts/dokka_zip.xml +++ /dev/null @@ -1,27 +0,0 @@ -<component name="ArtifactManager"> - <artifact name="dokka:zip"> - <output-path>$PROJECT_DIR$/out/artifacts</output-path> - <root id="root"> - <element id="archive" name="dokka.zip"> - <element id="directory" name="lib"> - <element id="artifact" artifact-name="dokka:jar" /> - <element id="library" level="project" name="trove4j" /> - <element id="library" level="project" name="jps-model" /> - <element id="library" level="project" name="asm" /> - <element id="library" level="project" name="protobuf" /> - <element id="library" level="project" name="picocontainer" /> - <element id="library" level="project" name="intellij-core-analysis" /> - <element id="library" level="project" name="markdown" /> - <element id="library" level="project" name="kotlin-for-upsource" /> - <element id="library" level="project" name="jsoup" /> - <element id="library" level="project" name="jdom" /> - <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> - </artifact> -</component>
\ No newline at end of file diff --git a/.idea/artifacts/javadoc_jar.xml b/.idea/artifacts/javadoc_jar.xml deleted file mode 100644 index 0f0eee5b..00000000 --- a/.idea/artifacts/javadoc_jar.xml +++ /dev/null @@ -1,8 +0,0 @@ -<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/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index ba49a93e..00000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,24 +0,0 @@ -<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 deleted file mode 100644 index 79ee123c..00000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ -<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 deleted file mode 100644 index 9700d3cc..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,45 +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> - <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" /> - </bytecodeTargetLevel> - </component> -</project>
\ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index f4aa08e3..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component name="CopyrightManager"> - <settings default="" /> -</component>
\ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index f7589596..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <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/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 06bda8c9..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,7 +0,0 @@ -<component name="InspectionProjectProfileManager"> - <profile version="1.0"> - <option name="myName" value="Project Default" /> - <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/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 8c1e55e8..00000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component name="InspectionProjectProfileManager"> - <settings> - <option name="PROJECT_PROFILE" value="Project Default" /> - <option name="USE_PROJECT_PROFILE" value="true" /> - <version value="1.0" /> - </settings> -</component>
\ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml deleted file mode 100644 index b072dc00..00000000 --- a/.idea/kotlinc.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?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.1" /> - </component> -</project>
\ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 537aa8e4..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ASMPluginConfiguration"> - <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" /> - <groovy codeStyle="LEGACY" /> - </component> - <component name="EntryPointsManager"> - <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.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"> - <file type="web" url="file://$PROJECT_DIR$/dokka-fatjar" /> - <file type="web" url="file://$PROJECT_DIR$/g |