Merge branch 'dev' of git://github.com/Xerus2000/dokka into Xerus2000-dev

update .gitignore and .idea

# Conflicts:
#	.idea/compiler.xml
#	.idea/kotlinc.xml
#	.idea/modules.xml
#	core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
#	core/src/main/kotlin/Java/JavadocParser.kt
#	core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt
#	core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
#	core/src/main/kotlin/Model/DocumentationReference.kt
#	core/src/main/kotlin/Model/PackageDocs.kt
#	core/src/main/kotlin/Model/SourceLinks.kt
#	core/src/main/kotlin/Utilities/DokkaModules.kt
#	core/src/main/kotlin/Utilities/ServiceLocator.kt
#	core/src/main/kotlin/javadoc/docbase.kt
#	core/src/test/kotlin/format/HtmlFormatTest.kt
#	core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
#	core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
#	core/src/test/kotlin/format/KotlinWebSiteRunnableSamplesFormatTest.kt
#	core/src/test/kotlin/issues/IssuesTest.kt

3 files changed, 6 insertions, 7 deletions

diff --git a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt
index 06753342..d6ed610a 100644
--- a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt
+++ b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt
@@ -31,7 +31,7 @@ abstract class AbstractDokkaAndroidGradleTest : AbstractDokkaGradleTest() {
             acceptedLicenses.listFiles().forEach { licenseFile ->
                 val target = sdkLicensesDir.resolve(licenseFile.name)
                 if(!target.exists() || target.readText() != licenseFile.readText()) {
-                    val overwrite = System.getProperty("android.licenses.overwrite", "false").toBoolean()
+                    val overwrite = System.getProperty("android.licenses.overwrite", "false")!!.toBoolean()
                     if (!target.exists() || overwrite) {
                         licenseFile.copyTo(target, true)
                         println("Accepted ${licenseFile.name}, by copying $licenseFile to $target")
diff --git a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt
index 255138a9..6bd5786f 100644
--- a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt
+++ b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt
@@ -7,15 +7,16 @@ import org.junit.Rule
 import org.junit.rules.TemporaryFolder
 import java.io.File
 import java.nio.file.Files
+import java.nio.file.Path
 import java.nio.file.Paths
 
 
-val testDataFolder = Paths.get("testData")
+val testDataFolder: Path = Paths.get("testData")
 
-val pluginClasspathData = Paths.get("build", "createClasspathManifest", "dokka-plugin-classpath.txt")
-val androidPluginClasspathData = pluginClasspathData.resolveSibling("android-dokka-plugin-classpath.txt")
+val pluginClasspathData: Path = Paths.get("build", "createClasspathManifest", "dokka-plugin-classpath.txt")
+val androidPluginClasspathData: Path = pluginClasspathData.resolveSibling("android-dokka-plugin-classpath.txt")
 
-val dokkaFatJarPathData = pluginClasspathData.resolveSibling("fatjar.txt")
+val dokkaFatJarPathData: Path = pluginClasspathData.resolveSibling("fatjar.txt")
 
 val androidLocalProperties = testDataFolder.resolve("android.local.properties").let { if (Files.exists(it)) it else null }
 
diff --git a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt
index 2a4ce712..9bc52273 100644
--- a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt
+++ b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt
@@ -2,8 +2,6 @@ package org.jetbrains.dokka.gradle
 
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.Test
-import java.nio.file.Path
-import java.nio.file.Paths
 import kotlin.test.assertEquals
 
 class AndroidLibDependsOnJavaLibTest: AbstractDokkaAndroidGradleTest() {