Merge branch 'dev'

1 files changed, 27 insertions, 22 deletions

diff --git a/core/src/main/kotlin/Generation/configurationImpl.kt b/core/src/main/kotlin/Generation/configurationImpl.kt
index f67582a7..34d4154e 100644
--- a/core/src/main/kotlin/Generation/configurationImpl.kt
+++ b/core/src/main/kotlin/Generation/configurationImpl.kt
@@ -32,26 +32,31 @@ class SourceRootImpl(path: String, override val platforms: List<String> = emptyL
 data class PackageOptionsImpl(override val prefix: String,
                               override val includeNonPublic: Boolean = false,
                               override val reportUndocumented: Boolean = true,
-                              override val skipDeprecated: Boolean = false) : DokkaConfiguration.PackageOptions
+                              override val skipDeprecated: Boolean = false,
+                              override val suppress: Boolean = false) : DokkaConfiguration.PackageOptions
 
-data class DokkaConfigurationImpl(override val moduleName: String,
-                                  override val classpath: List<String>,
-                                  override val sourceRoots: List<SourceRootImpl>,
-                                  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<SourceLinkDefinitionImpl>,
-                                  override val impliedPlatforms: List<String>,
-                                  override val perPackageOptions: List<PackageOptionsImpl>,
-                                  override val externalDocumentationLinks: List<ExternalDocumentationLinkImpl>,
-                                  override val noStdlibLink: Boolean,
-                                  override val cacheRoot: String?,
-                                  override val suppressedFiles: List<String>) : DokkaConfiguration
\ No newline at end of file
+data class DokkaConfigurationImpl(
+        override val moduleName: String,
+        override val classpath: List<String>,
+        override val sourceRoots: List<SourceRootImpl>,
+        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<SourceLinkDefinitionImpl>,
+        override val impliedPlatforms: List<String>,
+        override val perPackageOptions: List<PackageOptionsImpl>,
+        override val externalDocumentationLinks: List<ExternalDocumentationLinkImpl>,
+        override val noStdlibLink: Boolean,
+        override val cacheRoot: String?,
+        override val suppressedFiles: List<String>,
+        override val languageVersion: String?,
+        override val apiVersion: String?
+) : DokkaConfiguration
\ No newline at end of file