From ffa78ebfe12de927d30550e2b8100fd276449ba4 Mon Sep 17 00:00:00 2001 From: Gabryel Monteiro Date: Sun, 18 Oct 2020 22:38:16 -0300 Subject: [PATCH 1/6] Update to 1.4.0 --- docs/build.gradle | 32 +++++++++++++++++++------------- docs/gradle.properties | 2 +- settings.gradle | 7 +++++++ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index a016be253f..e12704fedd 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" + classpath("org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}") } } @@ -66,9 +66,7 @@ private Closure includeSourcesInDokka(String... approximateNames) { } } -dokka { - outputFormat = 'html' - +tasks.dokkaHtml { switch (true) { case project.hasProperty("DOKKA_PATH"): outputDirectory = project.property("DOKKA_PATH").toString() @@ -78,19 +76,27 @@ dokka { break } - multiplatform { - global { - skipDeprecated = true + dokkaSourceSets { + configureEach { + skipDeprecated.set(true) sourceLink { - path = "./" - url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/" - lineSuffix = "#L" + localDirectory.set(file("./")) + remoteUrl.set(new URL("https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/")) + remoteLineSuffix.set("#L") } } - common(includeSourcesInDokka("commonMain")) - js(includeSourcesInDokka("jsMain"/*, "commonMain"*/)) - jvm(includeSourcesInDokka("jvmMain"/*, "commonMain"*/)) + named("commonMain") { + includeSourcesInDokka("commonMain") + } + + named("jsMain") { + includeSourcesInDokka("jsMain/*", "commonMain/*") + } + + named("jvmMain") { + includeSourcesInDokka("jvmMain/*", "commonMain/*") + } } } diff --git a/docs/gradle.properties b/docs/gradle.properties index 3e3f5a7521..55021b5f4e 100644 --- a/docs/gradle.properties +++ b/docs/gradle.properties @@ -1,3 +1,3 @@ -dokka_version=0.10.1 +dokka_version=1.4.0 org.gradle.jvmargs=-Xmx1024m diff --git a/settings.gradle b/settings.gradle index 6c80087f13..f765964ad9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,10 @@ +pluginManagement { + repositories { + gradlePluginPortal() + jcenter() + } +} + include ":tgbotapi.core" include ":tgbotapi.extensions.api" include ":tgbotapi.extensions.utils" From c8a5552c9e9f8bae6a5a38ea890a44459f85985a Mon Sep 17 00:00:00 2001 From: Gabryel Monteiro Date: Mon, 19 Oct 2020 00:40:24 -0300 Subject: [PATCH 2/6] Adding projects --- docs/build.gradle | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index e12704fedd..11bf16b8fb 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -46,24 +46,14 @@ kotlin { } } -private Closure includeSourcesInDokka(String... approximateNames) { - return { - parent.subprojects.forEach { - if (it != project) { - File srcDir = new File(it.projectDir.absolutePath, "src") - if (srcDir.exists() && srcDir.isDirectory()) { - srcDir.eachFile { file -> - if (approximateNames.any { file.name.contains(it) } && file.isDirectory()) { - String pathToSrc = file.absolutePath - sourceRoot { - path = pathToSrc - } - } - } - } +private List findSourcesWithName(String... approximateNames) { + return parent.subprojects + .findAll { it != project } + .collectMany { it.kotlin.sourceSets } + .findAll { sourceSet -> approximateNames.any { + nameToFilter -> sourceSet.name.contains(nameToFilter) } - } - } + }.collect { it.kotlin } } tasks.dokkaHtml { @@ -88,15 +78,15 @@ tasks.dokkaHtml { } named("commonMain") { - includeSourcesInDokka("commonMain") + sourceRoots.setFrom(findSourcesWithName("commonMain")) } named("jsMain") { - includeSourcesInDokka("jsMain/*", "commonMain/*") + sourceRoots.setFrom(findSourcesWithName("jsMain", "commonMain")) } named("jvmMain") { - includeSourcesInDokka("jvmMain/*", "commonMain/*") + sourceRoots.setFrom(findSourcesWithName("jvmMain", "commonMain")) } } } From af53682b1f763bc687213efdb224ad78d59ebe67 Mon Sep 17 00:00:00 2001 From: Gabryel Monteiro Date: Mon, 19 Oct 2020 00:45:29 -0300 Subject: [PATCH 3/6] Removing kts notation --- docs/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build.gradle b/docs/build.gradle index 11bf16b8fb..24cfebd52a 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" - classpath("org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}") + classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" } } From 2d2fe01227de85ea47d9063bfdf9c44d199a505c Mon Sep 17 00:00:00 2001 From: Gabryel Monteiro Date: Mon, 19 Oct 2020 01:51:09 -0300 Subject: [PATCH 4/6] Changing Dokka version --- docs/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gradle.properties b/docs/gradle.properties index 55021b5f4e..b0e8ec1ae6 100644 --- a/docs/gradle.properties +++ b/docs/gradle.properties @@ -1,3 +1,3 @@ -dokka_version=1.4.0 +dokka_version=1.4.10 org.gradle.jvmargs=-Xmx1024m From e1ee54100560896fd2841ff0995ab75fa9006dc5 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 19 Oct 2020 19:45:46 +0600 Subject: [PATCH 5/6] extend max heap size for gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a07f5a51b1..58ea578fb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx1024m +org.gradle.jvmargs=-Xmx2048m kotlin.code.style=official org.gradle.parallel=true kotlin.js.generate.externals=true From 06639e5f3c9cf2b0528108871ddf7d3d5cd49552 Mon Sep 17 00:00:00 2001 From: Gabryel Monteiro Date: Thu, 22 Oct 2020 09:41:06 -0300 Subject: [PATCH 6/6] Update gradle.properties --- docs/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gradle.properties b/docs/gradle.properties index b0e8ec1ae6..55021b5f4e 100644 --- a/docs/gradle.properties +++ b/docs/gradle.properties @@ -1,3 +1,3 @@ -dokka_version=1.4.10 +dokka_version=1.4.0 org.gradle.jvmargs=-Xmx1024m