Merge branch 'dev'

3 files changed, 47 insertions, 25 deletions

diff --git a/integration/build.gradle b/integration/build.gradle
index 55ac9dca..24d59edf 100644
--- a/integration/build.gradle
+++ b/integration/build.gradle
@@ -1,13 +1,26 @@
 buildscript {
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_for_gradle_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 apply plugin: 'kotlin'
 
+
+sourceCompatibility = 1.8
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        languageVersion = "1.2"
+        apiVersion = "1.1"
+        jvmTarget = "1.8"
+    }
+}
+
 dependencies {
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: kotlin_for_gradle_version
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_for_gradle_version
-    compile 'com.github.yole:jkid:7d9c529c87'
+    compileOnly group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_for_gradle_runtime_version
+    compileOnly group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_for_gradle_runtime_version
+    compile('com.github.yole:jkid:8fc7f12e1a') {
+        transitive = false
+    }
 }
\ No newline at end of file
diff --git a/integration/src/main/kotlin/org/jetbrains/dokka/ReflectDsl.kt b/integration/src/main/kotlin/org/jetbrains/dokka/ReflectDsl.kt
index 3c9bf156..1984a3e5 100644
--- a/integration/src/main/kotlin/org/jetbrains/dokka/ReflectDsl.kt
+++ b/integration/src/main/kotlin/org/jetbrains/dokka/ReflectDsl.kt
@@ -1,6 +1,8 @@
 package org.jetbrains.dokka
 
 import kotlin.reflect.*
+import kotlin.reflect.full.memberFunctions
+import kotlin.reflect.full.memberProperties
 import kotlin.reflect.jvm.isAccessible
 
 object ReflectDsl {
diff --git a/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt b/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt
index 4c4d479f..90e5b5fc 100644
--- a/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt
+++ b/integration/src/main/kotlin/org/jetbrains/dokka/configuration.kt
@@ -36,6 +36,8 @@ interface DokkaConfiguration {
     val impliedPlatforms: List<String>
     val perPackageOptions: List<PackageOptions>
     val externalDocumentationLinks: List<DokkaConfiguration.ExternalDocumentationLink>
+    val languageVersion: String?
+    val apiVersion: String?
     val noStdlibLink: Boolean
     val cacheRoot: String?
     val suppressedFiles: List<String>
@@ -56,6 +58,7 @@ interface DokkaConfiguration {
         val includeNonPublic: Boolean
         val reportUndocumented: Boolean
         val skipDeprecated: Boolean
+        val suppress: Boolean
     }
 
     interface ExternalDocumentationLink {
@@ -78,27 +81,31 @@ interface DokkaConfiguration {
     }
 }
 
-data class SerializeOnlyDokkaConfiguration(override val moduleName: String,
-                                           override val classpath: List<String>,
-                                           override val sourceRoots: List<DokkaConfiguration.SourceRoot>,
-                                           override val samples: List<String>,
-                                           override val includes: List<String>,
-                                           override val outputDir: String,
-                                           override val format: String,
-                                           override val includeNonPublic: Boolean,
-                                           override val includeRootPackage: Boolean,
-                                           override val reportUndocumented: Boolean,
-                                           override val skipEmptyPackages: Boolean,
-                                           override val skipDeprecated: Boolean,
-                                           override val jdkVersion: Int,
-                                           override val generateIndexPages: Boolean,
-                                           override val sourceLinks: List<DokkaConfiguration.SourceLinkDefinition>,
-                                           override val impliedPlatforms: List<String>,
-                                           override val perPackageOptions: List<DokkaConfiguration.PackageOptions>,
-                                           override val externalDocumentationLinks: List<DokkaConfiguration.ExternalDocumentationLink>,
-                                           override val noStdlibLink: Boolean,
-                                           override val cacheRoot: String?,
-                                           override val suppressedFiles: List<String>) : DokkaConfiguration
+data class SerializeOnlyDokkaConfiguration(
+        override val moduleName: String,
+        override val classpath: List<String>,
+        override val sourceRoots: List<DokkaConfiguration.SourceRoot>,
+        override val samples: List<String>,
+        override val includes: List<String>,
+        override val outputDir: String,
+        override val format: String,
+        override val includeNonPublic: Boolean,
+        override val includeRootPackage: Boolean,
+        override val reportUndocumented: Boolean,
+        override val skipEmptyPackages: Boolean,
+        override val skipDeprecated: Boolean,
+        override val jdkVersion: Int,
+        override val generateIndexPages: Boolean,
+        override val sourceLinks: List<DokkaConfiguration.SourceLinkDefinition>,
+        override val impliedPlatforms: List<String>,
+        override val perPackageOptions: List<DokkaConfiguration.PackageOptions>,
+        override val externalDocumentationLinks: List<DokkaConfiguration.ExternalDocumentationLink>,
+        override val noStdlibLink: Boolean,
+        override val cacheRoot: String?,
+        override val suppressedFiles: List<String>,
+        override val languageVersion: String?,
+        override val apiVersion: String?
+) : DokkaConfiguration
 
 
 data class ExternalDocumentationLinkImpl(@CustomSerializer(UrlSerializer::class) override val url: URL,