15 files changed, 167 insertions, 67 deletions
diff --git a/build.gradle b/build.gradle
index 73636b24..2dfc4e01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,11 +15,6 @@ allprojects {
     group 'org.jetbrains.dokka'
     version dokka_version
 
-    def repo = {
-        artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/internal/[module](.[ext])")
-        artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/[module](.[ext])")
-        artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/[revision]/([module]_[ext]/)[module](.[ext])")
-    }
 
     buildscript {
         repositories {
@@ -27,7 +22,6 @@ allprojects {
             maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
             maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
             maven { url "https://plugins.gradle.org/m2/" }
-            ivy(repo)
         }
         dependencies {
             classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
@@ -45,7 +39,6 @@ allprojects {
         maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
         maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
         maven { url "https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/$bundled_kotlin_compiler_version/maven" }
-        ivy(repo)
         maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url "https://dl.bintray.com/kotlin/kotlinx" }
         maven { url "https://dl.bintray.com/orangy/maven" } // TODO: remove this repository when kotlinx.cli is available in maven
@@ -78,31 +71,7 @@ def bintrayPublication(project, List<String> _publications) {
     })
 }
 
-def versions = DependenciesVersionGetter.getVersions(project, bundled_kotlin_compiler_version)
-
-ext.ideaVersion = versions["idea.build.id"]
-ext.markdownVersion = versions["markdown.build.id"].replace("%20", " ")
-
-configurations {
-    ideaIC
-    intellijCore
-}
 
-repositories {
-    maven { url 'https://www.jetbrains.com/intellij-repository/snapshots' }
-    maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
-}
-
-dependencies {
-    intellijCore "com.jetbrains.intellij.idea:intellij-core:$ideaVersion"
-    ideaIC "com.jetbrains.intellij.idea:ideaIC:$ideaVersion"
-}
-
-def intellijCoreAnalysis() {
-    return zipTree(configurations.intellijCore.singleFile).matching ({
-        include("intellij-core-analysis.jar")
-    })
-}
 
 def ideaRT() {
     return zipTree(project.configurations.ideaIC.singleFile).matching ({
@@ -112,22 +81,6 @@ def ideaRT() {
 
 def repoLocation = uri(file("$buildDir/dist-maven"))
 
-configurations {
-    kotlin_plugin_full
-}
-
-dependencies {
-    final String ijVersion = "20" + ideaVersion.take(2) + "." + ideaVersion[2]
-    kotlin_plugin_full "teamcity:kotlin-plugin-$bundled_kotlin_compiler_version-IJ$ijVersion-1:$bundled_kotlin_compiler_version@zip"
-}
-
-def kotlinPluginDependency() {
-    return zipTree(configurations.kotlin_plugin_full.singleFile).matching({
-        include("Kotlin/lib/kotlin-plugin.jar")
-    })
-}
-
-
 allprojects {
 
     task publishToDistMaven {
@@ -149,4 +102,30 @@ allprojects {
         }
 
     }
+}
+
+ext.ivyrepo = {
+    artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/internal/[module](.[ext])")
+    artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/[module](.[ext])")
+    artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/[revision]/([module]_[ext]/)[module](.[ext])")
+}
+
+repositories {
+    ivy(ivyrepo)
+    maven { url 'https://www.jetbrains.com/intellij-repository/snapshots' }
+    maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
+}
+
+configurations {
+    ideaIC
+    intellijCore
+}
+def versions = DependenciesVersionGetter.getVersions(project, bundled_kotlin_compiler_version)
+
+ext.ideaVersion = versions["idea.build.id"]
+ext.markdownVersion = versions["markdown.build.id"].replace("%20", " ")
+
+dependencies {
+    intellijCore "com.jetbrains.intellij.idea:intellij-core:$ideaVersion"
+    ideaIC "com.jetbrains.intellij.idea:ideaIC:$ideaVersion"
 }
 \ No newline at end of file
diff --git a/core/build.gradle b/core/build.gradle
index 697fd726..76601901 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -6,19 +6,24 @@ buildscript {
     }
 }
 
-apply plugin: 'kotlin'
+allprojects {
+    apply plugin: 'kotlin'
 
-sourceCompatibility = 1.8
+    sourceCompatibility = 1.8
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-    kotlinOptions {
-        languageVersion = language_version
-        apiVersion = language_version
-        jvmTarget = "1.8"
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            languageVersion = language_version
+            apiVersion = language_version
+            jvmTarget = "1.8"
+        }
     }
 }
 
 dependencies {
+    compile project(":integration")
+    compile project(path: ":coreDependencies", configuration: "shadow")
+
     compile "org.jetbrains.kotlin:kotlin-stdlib:$bundled_kotlin_compiler_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$bundled_kotlin_compiler_version"
 
@@ -28,27 +33,37 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-compiler:$bundled_kotlin_compiler_version"
     compile "org.jetbrains.kotlin:kotlin-script-runtime:$bundled_kotlin_compiler_version"
 
-    compile "teamcity:kotlin-ide-common:$bundled_kotlin_compiler_version"
     compile "org.jetbrains:markdown:$markdownVersion"
 
-    compile intellijCoreAnalysis()
-    
-    compile kotlinPluginDependency()
-
     compile 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.8'
 
     //tools.jar
-    def toolsJar = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs().findAll { it.path.endsWith("jar") })
-    compileOnly toolsJar
-    testCompile toolsJar
+//    def toolsJar = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs().findAll { it.path.endsWith("jar") })
+//    compileOnly toolsJar
+//    testCompile toolsJar
 
-    compile project(":integration")
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_version
     testCompile "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
     implementation "com.google.code.gson:gson:$gson_version"
-    testCompile ideaRT()
+
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-js:$bundled_kotlin_compiler_version"
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-common:$bundled_kotlin_compiler_version"
-}
-\ No newline at end of file
+
+    testCompile ideaRT()
+}
+
+apply plugin: 'maven-publish'
+
+publishing {
+    publications {
+        dokkaCore(MavenPublication) { publication ->
+            artifactId = 'dokka-core'
+
+            from components.java
+        }
+    }
+}
+
+bintrayPublication(project, ["dokkaCore"])
diff --git a/core/testApi/build.gradle b/core/testApi/build.gradle
new file mode 100644
index 00000000..3d5bb61a
--- /dev/null
+++ b/core/testApi/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+    compileOnly project(":core")
+}
+\ No newline at end of file
diff --git a/coreDependencies/build.gradle b/coreDependencies/build.gradle
new file mode 100644
index 00000000..4677309c
--- /dev/null
+++ b/coreDependencies/build.gradle
@@ -0,0 +1,66 @@
+repositories {
+    ivy(ivyrepo)
+}
+
+configurations {
+    kotlin_plugin_full
+}
+
+dependencies {
+    final String ijVersion = "20" + ideaVersion.take(2) + "." + ideaVersion[2]
+    kotlin_plugin_full "teamcity:kotlin-plugin-$bundled_kotlin_compiler_version-IJ$ijVersion-1:$bundled_kotlin_compiler_version@zip"
+}
+
+def intellijCoreAnalysis() {
+    return zipTree(project(":").configurations.intellijCore.singleFile).matching ({
+        include("intellij-core-analysis.jar")
+    })
+}
+
+def kotlinPluginDependency() {
+
+    return zipTree(project.configurations.kotlin_plugin_full.singleFile).matching({
+        include("Kotlin/lib/kotlin-plugin.jar")
+    })
+}
+
+apply plugin: 'java'
+apply plugin: 'com.github.johnrengelman.shadow'
+
+dependencies {
+    compile kotlinPluginDependency()
+    compile intellijCoreAnalysis()
+    compile "teamcity:kotlin-ide-common:$bundled_kotlin_compiler_version"
+}
+
+shadowJar {
+    baseName = 'dokka-dependencies'
+    classifier = ''
+
+    configurations {
+        exclude compileOnly
+    }
+
+
+    exclude 'colorScheme/**'
+    exclude 'fileTemplates/**'
+    exclude 'inspectionDescriptions/**'
+    exclude 'intentionDescriptions/**'
+    exclude 'tips/**'
+    exclude 'messages/**'
+
+    exclude 'src/**'
+}
+
+apply plugin: 'maven-publish'
+
+publishing {
+    publications {
+        dokkaDependencies(MavenPublication) { publication ->
+            artifactId = 'dokka-dependencies'
+            project.shadow.component(publication)
+        }
+    }
+}
+
+bintrayPublication(project, ["dokkaDependencies"])
+\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7741642b..a409c348 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-dokka_version_base=0.10.0
+dokka_version_base=0.10.1
 dokka_publication_channel=dokka
 
 # Kotlin compiler and plugin
diff --git a/plugins/build.gradle b/plugins/build.gradle
new file mode 100644
index 00000000..55f6b014
--- /dev/null
+++ b/plugins/build.gradle
@@ -0,0 +1,19 @@
+buildscript {
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+allprojects {
+    apply plugin: 'kotlin'
+
+    sourceCompatibility = 1.8
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            languageVersion = language_version
+            apiVersion = language_version
+            jvmTarget = "1.8"
+        }
+    }
+}
+\ No newline at end of file
diff --git a/plugins/javadoc8/build.gradle b/plugins/javadoc8/build.gradle
new file mode 100644
index 00000000..e44fc94a
--- /dev/null
+++ b/plugins/javadoc8/build.gradle
@@ -0,0 +1,14 @@
+import javax.tools.ToolProvider
+
+
+dependencies {
+    compile project(':core')
+    compile "com.github.olivergondza:maven-jdk-tools-wrapper:0.1"
+
+    def toolsJar = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs().findAll { it.path.endsWith("jar") })
+    compileOnly toolsJar
+    testCompile toolsJar
+    testCompile project(":core").sourceSets.test.output
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_version
+}
+\ No newline at end of file
diff --git a/core/src/main/kotlin/javadoc/docbase.kt b/plugins/javadoc8/src/main/kotlin/javadoc/docbase.kt
index 0bf72ccf..0bf72ccf 100644
--- a/core/src/main/kotlin/javadoc/docbase.kt
+++ b/plugins/javadoc8/src/main/kotlin/javadoc/docbase.kt
diff --git a/core/src/main/kotlin/javadoc/dokka-adapters.kt b/plugins/javadoc8/src/main/kotlin/javadoc/dokka-adapters.kt
index 1329876a..1329876a 100644
--- a/core/src/main/kotlin/javadoc/dokka-adapters.kt
+++ b/plugins/javadoc8/src/main/kotlin/javadoc/dokka-adapters.kt
diff --git a/core/src/main/kotlin/javadoc/reporter.kt b/plugins/javadoc8/src/main/kotlin/javadoc/reporter.kt
index fc38368c..fc38368c 100644
--- a/core/src/main/kotlin/javadoc/reporter.kt
+++ b/plugins/javadoc8/src/main/kotlin/javadoc/reporter.kt
diff --git a/core/src/main/kotlin/javadoc/source-position.kt b/plugins/javadoc8/src/main/kotlin/javadoc/source-position.kt
index 6125f968..6125f968 100644
--- a/core/src/main/kotlin/javadoc/source-position.kt
+++ b/plugins/javadoc8/src/main/kotlin/javadoc/source-position.kt
diff --git a/core/src/main/kotlin/javadoc/tags.kt b/plugins/javadoc8/src/main/kotlin/javadoc/tags.kt
index 99c9bfff..99c9bfff 100644
--- a/core/src/main/kotlin/javadoc/tags.kt
+++ b/plugins/javadoc8/src/main/kotlin/javadoc/tags.kt
diff --git a/core/src/main/resources/dokka/format/javadoc.properties b/plugins/javadoc8/src/main/resources/dokka/format/javadoc.properties
index a0d8a945..a0d8a945 100644
--- a/core/src/main/resources/dokka/format/javadoc.properties
+++ b/plugins/javadoc8/src/main/resources/dokka/format/javadoc.properties
diff --git a/core/src/test/kotlin/javadoc/JavadocTest.kt b/plugins/javadoc8/src/test/kotlin/javadoc/JavadocTest.kt
index 1c4dd258..1c4dd258 100644
--- a/core/src/test/kotlin/javadoc/JavadocTest.kt
+++ b/plugins/javadoc8/src/test/kotlin/javadoc/JavadocTest.kt
diff --git a/settings.gradle b/settings.gradle
index 8a89d827..46c6e871 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,4 +7,8 @@ include 'core',
         'runners:cli',
         'runners:maven-plugin',
         'runners:gradle-plugin',
-        'runners:gradle-integration-tests'
+        'runners:android-gradle-plugin',
+        'runners:gradle-integration-tests',
+        'coreDependencies',
+        'plugins:javadoc8',
+        'core:testApi'