From 6b551610dfe0503a312b14fd860b2758d7707b1c Mon Sep 17 00:00:00 2001 From: porokoro Date: Sun, 20 Mar 2016 00:17:26 +0100 Subject: Provide basic support for Android library projects and make the source directories configurable for the user --- dokka-android-gradle-plugin/build.gradle | 86 ++++++++++++++++++++++ dokka-android-gradle-plugin/settings.gradle | 2 + .../src/main/kotlin/main.kt | 38 ++++++++++ .../org.jetbrains.dokka-android.properties | 1 + dokka-gradle-plugin/src/main/kotlin/main.kt | 75 ++++++++++++++++--- settings.gradle | 2 +- 6 files changed, 192 insertions(+), 12 deletions(-) create mode 100644 dokka-android-gradle-plugin/build.gradle create mode 100644 dokka-android-gradle-plugin/settings.gradle create mode 100644 dokka-android-gradle-plugin/src/main/kotlin/main.kt create mode 100644 dokka-android-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka-android.properties diff --git a/dokka-android-gradle-plugin/build.gradle b/dokka-android-gradle-plugin/build.gradle new file mode 100644 index 00000000..4e4a204f --- /dev/null +++ b/dokka-android-gradle-plugin/build.gradle @@ -0,0 +1,86 @@ +group 'org.jetbrains.dokka' +version dokka_version + +buildscript { + repositories { + mavenCentral() + jcenter() + maven { + url "https://dl.bintray.com/kotlin/kotlin-eap" + } + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' + } +} + +apply plugin: 'java' +apply plugin: 'kotlin' +apply plugin: 'maven-publish' +apply plugin: 'com.jfrog.bintray' + +sourceCompatibility = 1.6 + +repositories { + mavenCentral() + jcenter() + maven { + url "https://dl.bintray.com/kotlin/kotlin-eap" + } +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' + compile project(':core') + compile project(':dokka-gradle-plugin') + + compile gradleApi() + compile localGroovy() + + compile 'com.android.tools.build:gradle:2.0.0-beta7' +} + +sourceSets { + main.java.srcDirs += 'src/main/kotlin' +} + +task sourceJar(type: Jar) { + from sourceSets.main.allSource +} + +task wrapper(type: Wrapper) { + gradleVersion = '2.5' + distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip" +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + + artifact sourceJar { + classifier "sources" + } + } + } +} + +bintray { + user = System.getenv('BINTRAY_USER') + key = System.getenv('BINTRAY_KEY') + + pkg { + repo = dokka_eap.toBoolean() ? 'kotlin-eap' : 'dokka' + name = 'dokka' + userOrg = 'kotlin' + desc = 'Dokka, the Kotlin documentation tool' + vcsUrl = 'https://github.com/kotlin/dokka.git' + licenses = ['Apache-2.0'] + version { + name = dokka_version + } + } + + publications = ['mavenJava'] +} diff --git a/dokka-android-gradle-plugin/settings.gradle b/dokka-android-gradle-plugin/settings.gradle new file mode 100644 index 00000000..08876dc5 --- /dev/null +++ b/dokka-android-gradle-plugin/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'dokka-android-gradle-plugin' + diff --git a/dokka-android-gradle-plugin/src/main/kotlin/main.kt b/dokka-android-gradle-plugin/src/main/kotlin/main.kt new file mode 100644 index 00000000..9a92e2a2 --- /dev/null +++ b/dokka-android-gradle-plugin/src/main/kotlin/main.kt @@ -0,0 +1,38 @@ +package org.jetbrains.dokka.gradle + +import com.android.build.gradle.LibraryExtension +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.tasks.SourceSet +import java.io.File + +open class DokkaAndroidPlugin : Plugin { + override fun apply(project: Project) { + project.tasks.create("dokka", DokkaAndroidTask::class.java).apply { + moduleName = project.name + outputDirectory = File(project.buildDir, "dokka").absolutePath + } + } +} + +open class DokkaAndroidTask : DokkaTask() { + override val sdkProvider: SdkProvider? = AndroidSdkProvider(project) +} + +private class AndroidSdkProvider(private val project: Project) : SdkProvider { + private val ext by lazy { project.extensions.getByType(LibraryExtension::class.java) } + + override val name: String = "android" + + override val isValid: Boolean + get() = project.plugins.hasPlugin("com.android.library") + + override val classpath: List + get() = ext.bootClasspath + + override val sourceDirs: Set? + get() { + val sourceSet = ext.sourceSets.findByName(SourceSet.MAIN_SOURCE_SET_NAME) + return sourceSet?.java?.srcDirs + } +} diff --git a/dokka-android-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka-android.properties b/dokka-android-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka-android.properties new file mode 100644 index 00000000..03b28d93 --- /dev/null +++ b/dokka-android-gradle-plugin/src/main/resources/META-INF/gradle-plugins/org.jetbrains.dokka-android.properties @@ -0,0 +1 @@ +implementation-class=org.jetbrains.dokka.gradle.DokkaAndroidPlugin \ No newline at end of file diff --git a/dokka-gradle-plugin/src/main/kotlin/main.kt b/dokka-gradle-plugin/src/main/kotlin/main.kt index 476f7656..e3275501 100644 --- a/dokka-gradle-plugin/src/main/kotlin/main.kt +++ b/dokka-gradle-plugin/src/main/kotlin/main.kt @@ -44,6 +44,10 @@ open class DokkaTask : DefaultTask() { var samples: List = arrayListOf() @Input var jdkVersion: Int = 6 + @Input + var sourceDirs: Iterable = emptyList() + + protected open val sdkProvider: SdkProvider? = null fun linkMapping(closure: Closure) { val mapping = LinkMapping() @@ -63,13 +67,15 @@ open class DokkaTask : DefaultTask() { @TaskAction fun generate() { val project = project + val sdkProvider = sdkProvider val sourceDirectories = getSourceDirectories() val allConfigurations = project.configurations val classpath = - processConfigurations - .map { allConfigurations?.getByName(it.toString()) ?: throw IllegalArgumentException("No configuration $it found") } - .flatMap { it } + if (sdkProvider != null && sdkProvider.isValid) sdkProvider.classpath else emptyList() + + processConfigurations + .map { allConfigurations?.getByName(it.toString()) ?: throw IllegalArgumentException("No configuration $it found") } + .flatMap { it } if (sourceDirectories.isEmpty()) { logger.warn("No source directories found: skipping dokka generation") @@ -89,20 +95,33 @@ open class DokkaTask : DefaultTask() { ).generate() } - fun getSourceDirectories(): List { - val javaPluginConvention = project.convention.getPlugin(JavaPluginConvention::class.java) - val sourceSets = javaPluginConvention.sourceSets?.findByName(SourceSet.MAIN_SOURCE_SET_NAME) - return sourceSets?.allSource?.srcDirs?.filter { it.exists() } ?: emptyList() + fun getSourceDirectories(): Collection { + val provider = sdkProvider + val sourceDirs = if (sourceDirs.any()) { + logger.info("Dokka: Taking source directories provided by the user") + sourceDirs.toSet() + } else if (provider != null && provider.isValid) { + logger.info("Dokka: Taking source directories from ${provider.name} sdk provider") + provider.sourceDirs + } else { + logger.info("Dokka: Taking source directories from default java plugin") + val javaPluginConvention = project.convention.getPlugin(JavaPluginConvention::class.java) + val sourceSets = javaPluginConvention.sourceSets?.findByName(SourceSet.MAIN_SOURCE_SET_NAME) + sourceSets?.allSource?.srcDirs + } + + return sourceDirs?.filter { it.exists() } ?: emptyList() } + @Input @InputFiles @SkipWhenEmpty - fun getInputFiles() : FileCollection = project.files(getSourceDirectories().map { project.fileTree(it) }) + - project.files(includes) + - project.files(samples) + fun getInputFiles(): FileCollection = project.files(getSourceDirectories().map { project.fileTree(it) }) + + project.files(includes) + + project.files(samples) @OutputDirectory - fun getOutputDirectoryAsFile() : File = project.file(outputDirectory) + fun getOutputDirectoryAsFile(): File = project.file(outputDirectory) } @@ -111,3 +130,37 @@ open class LinkMapping { var url: String = "" var suffix: String? = null } + +/** + * A provider for SDKs that can be used if a project uses classes that live outside the JDK or uses a + * different method to determine the source directories. + * + * For example an Android library project configures its sources through the Android extension instead + * of the basic java convention. Also it has its custom classes located in the SDK installation directory. + */ +interface SdkProvider { + /** + * The name of this provider. Only used for logging purposes. + */ + val name: String + + /** + * Checks whether this provider has everything it needs to provide the source directories. + */ + val isValid: Boolean + + /** + * Provides additional classpath files where Dokka should search for external classes. + * The file list is injected **after** JDK Jars and **before** project dependencies. + * + * This is only called if [isValid] returns `true`. + */ + val classpath: List + + /** + * Provides a list of directories where Dokka should search for source files. + * + * This is only called if [isValid] returns `true`. + */ + val sourceDirs: Set? +} diff --git a/settings.gradle b/settings.gradle index f02d412e..5f59e822 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'core', 'dokka-gradle-plugin' +include 'core', 'dokka-gradle-plugin', 'dokka-android-gradle-plugin' -- cgit From 9e805338084e123706052b8328b2c92b4fd3a917 Mon Sep 17 00:00:00 2001 From: porokoro Date: Sun, 20 Mar 2016 03:51:42 +0100 Subject: Update README, explaining how to use Dokka with Android and how to set custom source directories --- README.md | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c45b2acc..88f4f632 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -dokka [![TeamCity (build status)](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/Kotlin_Dokka_DokkaAntMavenGradle.svg)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_Dokka_DokkaAntMavenGradle&branch_KotlinTools_Dokka=%3Cdefault%3E&tab=buildTypeStatusDiv) [ ![Download](https://api.bintray.com/packages/kotlin/dokka/dokka/images/download.svg) ](https://bintray.com/kotlin/dokka/dokka/_latestVersion) +dokka [![TeamCity (build status)](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/Kotlin_Dokka_DokkaAntMavenGradle.svg)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_Dokka_DokkaAntMavenGradle&branch_KotlinTools_Dokka=%3Cdefault%3E&tab=buildTypeStatusDiv) [ ![Download](https://api.bintray.com/packages/kotlin/dokka/dokka/images/download.svg) ](https://bintray.com/kotlin/dokka/dokka/_latestVersion) ===== Dokka is a documentation engine for Kotlin, performing the same function as javadoc for Java. @@ -121,9 +121,9 @@ Please see the [Dokka Maven example project](https://github.com/JetBrains/kotlin ```groovy buildscript { repositories { - mavenLocal() jcenter() } + dependencies { classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}" } @@ -148,6 +148,7 @@ dokka { url = "https://github.com/cy6erGn0m/vertx3-lang-kotlin/blob/master/src/main/kotlin" suffix = "#L" } + sourceDirs = files('src/main/kotlin') } ``` @@ -169,6 +170,27 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) { Please see the [Dokka Gradle example project](https://github.com/JetBrains/kotlin-examples/tree/master/gradle/dokka-gradle-example) for an example. +#### Android + +If you are using Android there is a separate gradle plugin. Just make sure you apply the plugin after +`com.android.library` and `kotlin-android`. + +```groovy +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}" + } +} + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'org.jetbrains.dokka-android' +``` + ## Dokka Internals ### Documentation Model @@ -184,26 +206,26 @@ Each reference between nodes also has semantic attached, and there are three of 2. Detail - reference means that target describes source in more details, form tree. 3. Link - any link to any other node, free form. -Member & Detail has reverse Owner reference, while Link's back reference is also Link. +Member & Detail has reverse Owner reference, while Link's back reference is also Link. -Nodes that are Details of other nodes cannot have Members. +Nodes that are Details of other nodes cannot have Members. ### Rendering Docs When we have documentation model, we can render docs in various formats, languages and layouts. We have some core services: * FormatService -- represents output format -* LocationService -- represents folder and file layout +* LocationService -- represents folder and file layout * SignatureGenerator -- represents target language by generating class/function/package signatures from model Basically, given the `documentation` as a model, we do this: ```kotlin - val signatureGenerator = KotlinSignatureGenerator() + val signatureGenerator = KotlinSignatureGenerator() val locationService = FoldersLocationService(arguments.outputDir) val markdown = JekyllFormatService(locationService, signatureGenerator) val generator = FileGenerator(signatureGenerator, locationService, markdown) - generator.generate(documentation) + generator.generate(documentation) ``` ## Building Dokka -- cgit From 908aa606ea7c46346b590aaee79dd6cc1851e36d Mon Sep 17 00:00:00 2001 From: porokoro Date: Sun, 20 Mar 2016 16:55:06 +0100 Subject: Update .idea project files --- .idea/compiler.xml | 6 + .idea/gradle.xml | 8 +- ...android_databinding_baseLibrary_2_0_0_beta7.xml | 11 + ...roid_databinding_compilerCommon_2_0_0_beta7.xml | 11 + ..._com_android_tools_annotations_25_0_0_beta7.xml | 11 + ...com_android_tools_build_builder_2_0_0_beta7.xml | 11 + ...droid_tools_build_builder_model_2_0_0_beta7.xml | 11 + ...id_tools_build_builder_test_api_2_0_0_beta7.xml | 11 + ..._com_android_tools_build_gradle_2_0_0_beta7.xml | 11 + ..._android_tools_build_gradle_api_2_0_0_beta7.xml | 11 + ...android_tools_build_gradle_core_2_0_0_beta7.xml | 11 + ...id_tools_build_manifest_merger_25_0_0_beta7.xml | 11 + ...adle__com_android_tools_common_25_0_0_beta7.xml | 11 + ..._com_android_tools_ddms_ddmlib_25_0_0_beta7.xml | 11 + ...radle__com_android_tools_dvlib_25_0_0_beta7.xml | 11 + ...roid_tools_external_lombok_lombok_ast_0_2_3.xml | 11 + ...adle__com_android_tools_jack_jack_api_0_9_0.xml | 11 + ...adle__com_android_tools_jill_jill_api_0_9_0.xml | 11 + ..._tools_layoutlib_layoutlib_api_25_0_0_beta7.xml | 11 + ...e__com_android_tools_lint_lint_25_0_0_beta7.xml | 11 + ...om_android_tools_lint_lint_api_25_0_0_beta7.xml | 11 + ...android_tools_lint_lint_checks_25_0_0_beta7.xml | 11 + ...__com_android_tools_repository_25_0_0_beta7.xml | 11 + ...__com_android_tools_sdk_common_25_0_0_beta7.xml | 11 + ...adle__com_android_tools_sdklib_25_0_0_beta7.xml | 11 + .../Gradle__com_google_code_gson_gson_2_2_4.xml | 11 + .../Gradle__com_google_guava_guava_17_0.xml | 11 + ...e_juniversalchardet_juniversalchardet_1_0_3.xml | 11 + .../Gradle__com_intellij_annotations_12_0.xml | 11 + .../Gradle__com_squareup_javawriter_2_5_0.xml | 11 + .../Gradle__com_tunnelvisionlabs_antlr4_4_5.xml | 11 + ...com_tunnelvisionlabs_antlr4_annotations_4_5.xml | 11 + ...le__com_tunnelvisionlabs_antlr4_runtime_4_5.xml | 11 + .../Gradle__commons_codec_commons_codec_1_4.xml | 11 + .../Gradle__commons_io_commons_io_2_4.xml | 11 + ...adle__commons_logging_commons_logging_1_1_1.xml | 11 + .../libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml | 11 + ...Gradle__net_sf_proguard_proguard_base_5_2_1.xml | 11 + ...adle__net_sf_proguard_proguard_gradle_5_2_1.xml | 11 + ..._treelayout_org_abego_treelayout_core_1_0_1.xml | 11 + .idea/libraries/Gradle__org_antlr_ST4_4_0_8.xml | 11 + .idea/libraries/Gradle__org_antlr_antlr_3_5_2.xml | 11 + .../Gradle__org_antlr_antlr_runtime_3_5_2.xml | 11 + ...__org_apache_commons_commons_compress_1_8_1.xml | 11 + ..._org_apache_httpcomponents_httpclient_4_1_1.xml | 11 + ...dle__org_apache_httpcomponents_httpcore_4_1.xml | 11 + ...dle__org_apache_httpcomponents_httpmime_4_1.xml | 11 + ...radle__org_bouncycastle_bcpkix_jdk15on_1_48.xml | 11 + ...radle__org_bouncycastle_bcprov_jdk15on_1_48.xml | 11 + ...le__org_eclipse_jdt_core_compiler_ecj_4_4_2.xml | 11 + ...g_jacoco_org_jacoco_core_0_7_4_201502262128.xml | 11 + ...__org_jetbrains_kotlin_kotlin_runtime_1_0_0.xml | 11 + ...tbrains_kotlin_kotlin_runtime_1_0_0_rc_1007.xml | 11 - ...dle__org_jetbrains_kotlin_kotlin_test_1_0_0.xml | 11 + ..._jetbrains_kotlin_kotlin_test_1_0_0_rc_1007.xml | 11 - ...rg_jetbrains_kotlin_kotlin_test_junit_1_0_0.xml | 11 + ...ains_kotlin_kotlin_test_junit_1_0_0_rc_1007.xml | 11 - .idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml | 11 + .../Gradle__org_ow2_asm_asm_analysis_5_0_3.xml | 11 + .../Gradle__org_ow2_asm_asm_commons_5_0_3.xml | 11 + .../Gradle__org_ow2_asm_asm_debug_all_5_0_1.xml | 11 + .../Gradle__org_ow2_asm_asm_tree_5_0_3.xml | 11 + .idea/modules.xml | 13 +- .idea/modules/core/core.iml | 12 + .idea/modules/core/core_main.iml | 221 +++ .idea/modules/core/core_test.iml | 228 +++ .../dokka-android-gradle-plugin.iml | 12 + .../dokka-android-gradle-plugin_main.iml | 2048 +++++++++++++++++++ .../dokka-android-gradle-plugin_test.iml | 2052 ++++++++++++++++++++ .../dokka-gradle-plugin/dokka-gradle-plugin.iml | 12 + .../dokka-gradle-plugin_main.iml | 1994 +++++++++++++++++++ .../dokka-gradle-plugin_test.iml | 1998 +++++++++++++++++++ .idea/modules/dokka.iml | 12 + .idea/runConfigurations/Dokka.xml | 4 +- .idea/runConfigurations/Stdlib.xml | 4 +- .idea/runConfigurations/Stdlib_Javadoc.xml | 4 +- core/core.iml | 115 -- dokka-gradle-plugin/dokka-gradle-plugin.iml | 1561 --------------- dokka.iml | 14 - 79 files changed, 9239 insertions(+), 1739 deletions(-) create mode 100644 .idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_external_lombok_lombok_ast_0_2_3.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_jack_jack_api_0_9_0.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_jill_jill_api_0_9_0.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml create mode 100644 .idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml create mode 100644 .idea/libraries/Gradle__com_google_guava_guava_17_0.xml create mode 100644 .idea/libraries/Gradle__com_googlecode_juniversalchardet_juniversalchardet_1_0_3.xml create mode 100644 .idea/libraries/Gradle__com_intellij_annotations_12_0.xml create mode 100644 .idea/libraries/Gradle__com_squareup_javawriter_2_5_0.xml create mode 100644 .idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_4_5.xml create mode 100644 .idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_annotations_4_5.xml create mode 100644 .idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_runtime_4_5.xml create mode 100644 .idea/libraries/Gradle__commons_codec_commons_codec_1_4.xml create mode 100644 .idea/libraries/Gradle__commons_io_commons_io_2_4.xml create mode 100644 .idea/libraries/Gradle__commons_logging_commons_logging_1_1_1.xml create mode 100644 .idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml create mode 100644 .idea/libraries/Gradle__net_sf_proguard_proguard_base_5_2_1.xml create mode 100644 .idea/libraries/Gradle__net_sf_proguard_proguard_gradle_5_2_1.xml create mode 100644 .idea/libraries/Gradle__org_abego_treelayout_org_abego_treelayout_core_1_0_1.xml create mode 100644 .idea/libraries/Gradle__org_antlr_ST4_4_0_8.xml create mode 100644 .idea/libraries/Gradle__org_antlr_antlr_3_5_2.xml create mode 100644 .idea/libraries/Gradle__org_antlr_antlr_runtime_3_5_2.xml create mode 100644 .idea/libraries/Gradle__org_apache_commons_commons_compress_1_8_1.xml create mode 100644 .idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_1_1.xml create mode 100644 .idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_1.xml create mode 100644 .idea/libraries/Gradle__org_apache_httpcomponents_httpmime_4_1.xml create mode 100644 .idea/libraries/Gradle__org_bouncycastle_bcpkix_jdk15on_1_48.xml create mode 100644 .idea/libraries/Gradle__org_bouncycastle_bcprov_jdk15on_1_48.xml create mode 100644 .idea/libraries/Gradle__org_eclipse_jdt_core_compiler_ecj_4_4_2.xml create mode 100644 .idea/libraries/Gradle__org_jacoco_org_jacoco_core_0_7_4_201502262128.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_0.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_0_rc_1007.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_0_0.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_1_0_0_rc_1007.xml create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_0_0.xml delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_test_junit_1_0_0_rc_1007.xml create mode 100644 .idea/libraries/Gradle__org_ow2_asm_asm_5_0_3.xml create mode 100644 .idea/libraries/Gradle__org_ow2_asm_asm_analysis_5_0_3.xml create mode 100644 .idea/libraries/Gradle__org_ow2_asm_asm_commons_5_0_3.xml create mode 100644 .idea/libraries/Gradle__org_ow2_asm_asm_debug_all_5_0_1.xml create mode 100644 .idea/libraries/Gradle__org_ow2_asm_asm_tree_5_0_3.xml create mode 100644 .idea/modules/core/core.iml create mode 100644 .idea/modules/core/core_main.iml create mode 100644 .idea/modules/core/core_test.iml create mode 100644 .idea/modules/dokka-android-gradle-plugin/dokka-android-gradle-plugin.iml create mode 100644 .idea/modules/dokka-android-gradle-plugin/dokka-android-gradle-plugin_main.iml create mode 100644 .idea/modules/dokka-android-gradle-plugin/dokka-android-gradle-plugin_test.iml create mode 100644 .idea/modules/dokka-gradle-plugin/dokka-gradle-plugin.iml create mode 100644 .idea/modules/dokka-gradle-plugin/dokka-gradle-plugin_main.iml create mode 100644 .idea/modules/dokka-gradle-plugin/dokka-gradle-plugin_test.iml create mode 100644 .idea/modules/dokka.iml delete mode 100644 core/core.iml delete mode 100644 dokka-gradle-plugin/dokka-gradle-plugin.iml delete mode 100644 dokka.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index c928ac74..1e9211e0 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -25,6 +25,12 @@ + + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 3d03cd3a..2e481f64 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,17 +10,11 @@ diff --git a/.idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml new file mode 100644 index 00000000..5481d5a2 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_databinding_baseLibrary_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml new file mode 100644 index 00000000..49f396f4 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_databinding_compilerCommon_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml new file mode 100644 index 00000000..18733c33 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_annotations_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml new file mode 100644 index 00000000..9f404f1c --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_builder_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml new file mode 100644 index 00000000..ead74841 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_builder_model_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml new file mode 100644 index 00000000..3a56673e --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_builder_test_api_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml new file mode 100644 index 00000000..f1f9c0e2 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_gradle_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml new file mode 100644 index 00000000..972a6ef7 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_gradle_api_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml new file mode 100644 index 00000000..a51eb9e8 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_gradle_core_2_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml new file mode 100644 index 00000000..c14022f3 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_build_manifest_merger_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml new file mode 100644 index 00000000..2a268a7d --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_common_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml new file mode 100644 index 00000000..6dcf3622 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_ddms_ddmlib_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml new file mode 100644 index 00000000..e1a23524 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_dvlib_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_external_lombok_lombok_ast_0_2_3.xml b/.idea/libraries/Gradle__com_android_tools_external_lombok_lombok_ast_0_2_3.xml new file mode 100644 index 00000000..7dfb7130 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_external_lombok_lombok_ast_0_2_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_jack_jack_api_0_9_0.xml b/.idea/libraries/Gradle__com_android_tools_jack_jack_api_0_9_0.xml new file mode 100644 index 00000000..1aefb3d0 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_jack_jack_api_0_9_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_jill_jill_api_0_9_0.xml b/.idea/libraries/Gradle__com_android_tools_jill_jill_api_0_9_0.xml new file mode 100644 index 00000000..2e644ba8 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_jill_jill_api_0_9_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml new file mode 100644 index 00000000..48e9be30 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_layoutlib_layoutlib_api_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml new file mode 100644 index 00000000..34fa06ef --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_lint_lint_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml new file mode 100644 index 00000000..858461ae --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_lint_lint_api_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml new file mode 100644 index 00000000..117f5c68 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_lint_lint_checks_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml new file mode 100644 index 00000000..d99ff508 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_repository_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml new file mode 100644 index 00000000..ea6a6cea --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_sdk_common_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml b/.idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml new file mode 100644 index 00000000..ec5e63f5 --- /dev/null +++ b/.idea/libraries/Gradle__com_android_tools_sdklib_25_0_0_beta7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml new file mode 100644 index 00000000..5fadbfbb --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_2_4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml new file mode 100644 index 00000000..0ecc15e1 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_guava_guava_17_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_googlecode_juniversalchardet_juniversalchardet_1_0_3.xml b/.idea/libraries/Gradle__com_googlecode_juniversalchardet_juniversalchardet_1_0_3.xml new file mode 100644 index 00000000..b514a0a3 --- /dev/null +++ b/.idea/libraries/Gradle__com_googlecode_juniversalchardet_juniversalchardet_1_0_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml b/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml new file mode 100644 index 00000000..55f6be37 --- /dev/null +++ b/.idea/libraries/Gradle__com_intellij_annotations_12_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_5_0.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_5_0.xml new file mode 100644 index 00000000..a9380f64 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_5_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_4_5.xml b/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_4_5.xml new file mode 100644 index 00000000..d693d96e --- /dev/null +++ b/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_4_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_annotations_4_5.xml b/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_annotations_4_5.xml new file mode 100644 index 00000000..bdb06325 --- /dev/null +++ b/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_annotations_4_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_runtime_4_5.xml b/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_runtime_4_5.xml new file mode 100644 index 00000000..f2daab5d --- /dev/null +++ b/.idea/libraries/Gradle__com_tunnelvisionlabs_antlr4_runtime_4_5.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_codec_commons_codec_1_4.xml b/.idea/libraries/Gradle__commons_codec_commons_codec_1_4.xml new file mode 100644 index 00000000..44fa95f0 --- /dev/null +++ b/.idea/libraries/Gradle__commons_codec_commons_codec_1_4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml b/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml new file mode 100644 index 00000000..2ce45d1b --- /dev/null +++ b/.idea/libraries/Gradle__commons_io_commons_io_2_4.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_1.xml new file mode 100644 index 00000000..b9fb7515 --- /dev/null +++ b/.idea/libraries/Gradle__commons_logging_commons_logging_1_1_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml new file mode 100644 index 00000000..bf61f5a1 --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_proguard_proguard_base_5_2_1.xml b/.idea/libraries/Gradle__net_sf_proguard_proguard_base_5_2_1.xml new file mode 100644 index 00000000..45e25485 --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_proguard_proguard_base_5_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_proguard_proguard_gradle_5_2_1.xml b/.idea/libraries/Gradle__net_sf_proguard_proguard_gradle_5_2_1.xml new file mode 100644 index 00000000..f9b67be2 --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_proguard_proguard_gradle_5_2_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_abego_treelayout_org_abego_treelayout_core_1_0_1.xml b/.idea/libraries/Gradle__org_abego_treelayout_org_abego_treelayout_core_1_0_1.xml new file mode 100644 index 00000000..4844a08a --- /dev/null +++ b/.idea/libraries/Gradle__org_abego_treelayout_org_abego_treelayout_core_1_0_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_antlr_ST4_4_0_8.xml b/.idea/libraries/Gradle__org_antlr_ST4_4_0_8.xml new file mode 100644 index 00000000..8bacbdcc --- /dev/null +++ b/.idea/libraries/Gradle__org_antlr_ST4_4_0_8.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_antlr_antlr_3_5_2.xml b/.idea/libraries/Gradle__org_antlr_antlr_3_5_2.xml new file mode 100644 index 00000000..93a60e6c --- /dev/null +++ b/.idea/libraries/Gradle__org_antlr_antlr_3_5_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_antlr_antlr_runtime_3_5_2.xml b/.idea/libraries/Gradle__org_antlr_antlr_runtime_3_5_2.xml new file mode 100644 index 00000000..a7c38fea --- /dev/null +++ b/.idea/libraries/Gradle__org_antlr_antlr_runtime_3_5_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_8_1.xml b/.idea/libraries/Gradle__org_apache_commons_commons_compress_1_8_1.xml new file mode 100644 index 00000000..2cc93e91 --- /dev/null +++ b/.idea/libraries/Gradle__or