0.1.5. Refactored dokka and extension logic

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "scientifik"
-version = "0.1.4"
+version = "0.1.5"
 
 repositories {
     gradlePluginPortal()

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

src/main/kotlin/scientifik/ScientifikExtension.kt

@@ -1,15 +1,35 @@
 package scientifik
 
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.findByType
 
 open class ScientifikExtension {
-    var githubProject: String? = null
+    fun Project.withDokka() {
-    var vcs: String? = null
+        apply(plugin = "org.jetbrains.dokka")
-    var bintrayRepo: String? = null
+        subprojects {
-    var kdoc: Boolean = true
+            this.scientifik.apply{
+                withDokka()
+            }
+        }
+    }
+
+    fun Project.withSerialization() {
+        apply(plugin = "kotlinx-serialization")
+        _serialization = true
+        //recursively apply to all subprojecs
+        subprojects{
+            this.scientifik.apply{
+                withSerialization()
+            }
+        }
+    }
+
+    private var _serialization = false
     var serialization = false
+
+
     var io = false
 }
 

src/main/kotlin/scientifik/ScientifikJVMPlugin.kt

@@ -3,9 +3,12 @@ package scientifik
 import Scientifik
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
+import org.gradle.api.plugins.JavaBasePlugin
-import org.gradle.kotlin.dsl.get
+import org.gradle.api.publish.PublishingExtension
-import org.gradle.kotlin.dsl.withType
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.tasks.bundling.Jar
+import org.gradle.kotlin.dsl.*
+import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -15,7 +18,7 @@ open class ScientifikJVMPlugin : Plugin<Project> {
 
         with(project) {
             plugins.apply("org.jetbrains.kotlin.jvm")
-            plugins.apply("kotlinx-serialization")
+            plugins.apply("maven-publish")
 
             repositories.applyRepos()
 
@@ -26,7 +29,7 @@ open class ScientifikJVMPlugin : Plugin<Project> {
             }
 
             configure<KotlinJvmProjectExtension> {
-                sourceSets["main"].apply {
+                val sourceSet = sourceSets["main"].apply {
                     languageSettings.applySettings()
 
                     dependencies {
@@ -41,7 +44,46 @@ open class ScientifikJVMPlugin : Plugin<Project> {
                         }
                     }
                 }
+
+                val sourcesJar by tasks.registering(Jar::class) {
+                    archiveClassifier.set("sources")
+                    from(sourceSet.kotlin.srcDirs.first())
+                }
+
+                configure<PublishingExtension> {
+                    publications {
+                        register("jvm", MavenPublication::class) {
+                            from(components["java"])
+                            artifact(sourcesJar.get())
+                        }
+                    }
+                }
             }
+
+            pluginManager.withPlugin("org.jetbrains.dokka") {
+                val dokka by tasks.getting(DokkaTask::class) {
+                    outputFormat = "html"
+                    outputDirectory = "$buildDir/javadoc"
+                    jdkVersion = 8
+                }
+
+                val kdocJar by tasks.registering(Jar::class) {
+                    group = JavaBasePlugin.DOCUMENTATION_GROUP
+                    dependsOn(dokka)
+                    archiveClassifier.set("javadoc")
+                    from("$buildDir/javadoc")
+                }
+
+                configure<PublishingExtension> {
+                    publications {
+                        getByName("jvm") {
+                            this as MavenPublication
+                            artifact(kdocJar.get())
+                        }
+                    }
+                }
+            }
+
         }
 
     }

src/main/kotlin/scientifik/ScientifikMPPlugin.kt

@@ -3,8 +3,13 @@ package scientifik
 import Scientifik
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.plugins.JavaBasePlugin
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.*
+import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpack
 import java.io.File
@@ -13,120 +18,167 @@ open class ScientifikMPPlugin : Plugin<Project> {
     override fun apply(project: Project) {
         val extension = project.scientifik
 
-        project.plugins.apply("org.jetbrains.kotlin.multiplatform")
+        project.run {
-        project.plugins.apply("kotlinx-serialization")
 
-        project.repositories.applyRepos()
+            plugins.apply("org.jetbrains.kotlin.multiplatform")
 
-        project.configure<KotlinMultiplatformExtension> {
+            repositories.applyRepos()
-            jvm {
-                compilations.all {
-                    kotlinOptions {
-                        jvmTarget = "1.8"
-                    }
-                }
-            }
 
-            js {
+            configure<KotlinMultiplatformExtension> {
-                browser {}
+                jvm {
-            }
+                    compilations.all {
-
+                        kotlinOptions {
-
+                            jvmTarget = "1.8"
-            sourceSets.invoke {
-                val commonMain by getting {
-                    dependencies {
-                        api(kotlin("stdlib"))
-                        project.afterEvaluate {
-                            if (extension.serialization) {
-                                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:${Scientifik.serializationVersion}")
-                            }
-                            if(extension.io){
-                                api("org.jetbrains.kotlinx:kotlinx-io:${Scientifik.ioVersion}")
-                            }
-                        }
-                    }
-                }
-                val commonTest by getting {
-                    dependencies {
-                        implementation(kotlin("test-common"))
-                        implementation(kotlin("test-annotations-common"))
-                    }
-                }
-                val jvmMain by getting {
-                    dependencies {
-                        api(kotlin("stdlib-jdk8"))
-                        project.afterEvaluate {
-                            if (extension.serialization) {
-                                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Scientifik.serializationVersion}")
-                            }
-
-                            if (extension.io) {
-                                api("org.jetbrains.kotlinx:kotlinx-io-jvm:${Scientifik.ioVersion}")
-                            }
-                        }
-                    }
-                }
-                val jvmTest by getting {
-                    dependencies {
-                        implementation(kotlin("test"))
-                        implementation(kotlin("test-junit"))
-                    }
-                }
-                val jsMain by getting {
-                    dependencies {
-                        api(kotlin("stdlib-js"))
-                        project.afterEvaluate {
-                            if (extension.serialization) {
-                                implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:${Scientifik.serializationVersion}")
-                            }
-
-                            if (extension.io) {
-                                api("org.jetbrains.kotlinx:kotlinx-io-js:${Scientifik.ioVersion}")
-                            }
-                        }
-                    }
-                }
-                val jsTest by getting {
-                    dependencies {
-                        implementation(kotlin("test-js"))
-                    }
-                }
-            }
-
-            targets.all {
-                sourceSets.all {
-                    languageSettings.applySettings()
-                }
-            }
-        }
-
-        project.tasks.apply {
-            val jsBrowserWebpack by getting(KotlinWebpack::class) {
-                archiveClassifier = "js"
-                project.afterEvaluate {
-                    val destination = listOf(archiveBaseName, archiveAppendix, archiveVersion, archiveClassifier)
-                        .filter { it != null && it.isNotBlank() }
-                        .joinToString("-")
-                    destinationDirectory = destinationDirectory?.resolve(destination)
-                }
-                archiveFileName = "main.bundle.js"
-            }
-
-            project.afterEvaluate {
-                val installJsDist by creating(Copy::class) {
-                    group = "distribution"
-                    dependsOn(jsBrowserWebpack)
-                    from(project.fileTree("src/jsMain/web"))
-                    into(jsBrowserWebpack.destinationDirectory!!)
-                    doLast{
-                        val indexFile = File(jsBrowserWebpack.destinationDirectory!!,"index.html")
-                        if(indexFile.exists()){
-                            println("Run JS distribution at: ${indexFile.canonicalPath}")
                         }
                     }
                 }
 
-                findByName("assemble")?.dependsOn(installJsDist)
+                js {
+                    browser {}
+                }
+
+
+                sourceSets.invoke {
+                    val commonMain by getting {
+                        dependencies {
+                            api(kotlin("stdlib"))
+                            project.afterEvaluate {
+                                if (extension.serialization) {
+                                    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:${Scientifik.serializationVersion}")
+                                }
+                                if (extension.io) {
+                                    api("org.jetbrains.kotlinx:kotlinx-io:${Scientifik.ioVersion}")
+                                }
+                            }
+                        }
+                    }
+                    val commonTest by getting {
+                        dependencies {
+                            implementation(kotlin("test-common"))
+                            implementation(kotlin("test-annotations-common"))
+                        }
+                    }
+                    val jvmMain by getting {
+                        dependencies {
+                            api(kotlin("stdlib-jdk8"))
+                            project.afterEvaluate {
+                                if (extension.serialization) {
+                                    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Scientifik.serializationVersion}")
+                                }
+
+                                if (extension.io) {
+                                    api("org.jetbrains.kotlinx:kotlinx-io-jvm:${Scientifik.ioVersion}")
+                                }
+                            }
+                        }
+                    }
+                    val jvmTest by getting {
+                        dependencies {
+                            implementation(kotlin("test"))
+                            implementation(kotlin("test-junit"))
+                        }
+                    }
+                    val jsMain by getting {
+                        dependencies {
+                            api(kotlin("stdlib-js"))
+                            project.afterEvaluate {
+                                if (extension.serialization) {
+                                    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:${Scientifik.serializationVersion}")
+                                }
+
+                                if (extension.io) {
+                                    api("org.jetbrains.kotlinx:kotlinx-io-js:${Scientifik.ioVersion}")
+                                }
+                            }
+                        }
+                    }
+                    val jsTest by getting {
+                        dependencies {
+                            implementation(kotlin("test-js"))
+                        }
+                    }
+                }
+
+                targets.all {
+                    sourceSets.all {
+                        languageSettings.applySettings()
+                    }
+                }
+
+                pluginManager.withPlugin("org.jetbrains.dokka") {
+                    val dokka by tasks.getting(DokkaTask::class) {
+                        outputFormat = "html"
+                        outputDirectory = "$buildDir/javadoc"
+                        jdkVersion = 8
+
+                        kotlinTasks {
+                            // dokka fails to retrieve sources from MPP-tasks so we only define the jvm task
+                            listOf(tasks.getByPath("compileKotlinJvm"))
+                        }
+                        sourceRoot {
+                            // assuming only single source dir
+                            path = sourceSets["commonMain"].kotlin.srcDirs.first().toString()
+                            platforms = listOf("Common")
+                        }
+                        // although the JVM sources are now taken from the task,
+                        // we still define the jvm source root to get the JVM marker in the generated html
+                        sourceRoot {
+                            // assuming only single source dir
+                            path = sourceSets["jvmMain"].kotlin.srcDirs.first().toString()
+                            platforms = listOf("JVM")
+                        }
+
+                    }
+
+                    val kdocJar by tasks.registering(Jar::class) {
+                        group = JavaBasePlugin.DOCUMENTATION_GROUP
+                        dependsOn(dokka)
+                        archiveClassifier.set("javadoc")
+                        from("$buildDir/javadoc")
+                    }
+
+                    configure<PublishingExtension> {
+
+                        targets.all {
+                            val publication = publications.findByName(name) as MavenPublication
+
+                            // Patch publications with fake javadoc
+                            publication.artifact(kdocJar.get())
+                        }
+                    }
+                }
+            }
+
+
+
+            tasks.apply {
+                val jsBrowserWebpack by getting(KotlinWebpack::class) {
+                    archiveClassifier = "js"
+                    project.afterEvaluate {
+                        val destination = listOf(archiveBaseName, archiveAppendix, archiveVersion, archiveClassifier)
+                            .filter { it != null && it.isNotBlank() }
+                            .joinToString("-")
+                        destinationDirectory = destinationDirectory?.resolve(destination)
+                    }
+                    archiveFileName = "main.bundle.js"
+                }
+
+                afterEvaluate {
+                    val installJsDist by creating(Copy::class) {
+                        group = "distribution"
+                        dependsOn(jsBrowserWebpack)
+                        from(project.fileTree("src/jsMain/web"))
+                        into(jsBrowserWebpack.destinationDirectory!!)
+                        doLast {
+                            val indexFile = File(jsBrowserWebpack.destinationDirectory!!, "index.html")
+                            if (indexFile.exists()) {
+                                println("Run JS distribution at: ${indexFile.canonicalPath}")
+                            }
+                        }
+                    }
+
+                    findByName("assemble")?.dependsOn(installJsDist)
+                }
             }
         }
 

src/main/kotlin/scientifik/ScientifikPublishPlugin.kt

@@ -5,63 +5,37 @@ import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
 import groovy.lang.GroovyObject
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.internal.artifact.FileBasedMavenArtifact
 import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
-import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.*
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
 import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig
 import org.jfrog.gradle.plugin.artifactory.dsl.ResolverConfig
 import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
 
 
-// recursively search up the project chain for configuration
-private val Project.bintrayRepo: String?
-    get() = extensions.findByType<ScientifikExtension>()?.bintrayRepo
-        ?: parent?.bintrayRepo
-        ?: (findProperty("bintrayRepo") as? String)
-
-private val Project.githubProject: String?
-    get() = extensions.findByType<ScientifikExtension>()?.githubProject
-        ?: parent?.githubProject
-        ?: (findProperty("githubProject") as? String)
-
-private val Project.vcs: String?
-    get() = extensions.findByType<ScientifikExtension>()?.vcs
-        ?: parent?.vcs
-        ?: (findProperty("vcs") as? String)
-        ?: githubProject?.let { "https://github.com/mipt-npm/$it" }
-
 open class ScientifikPublishPlugin : Plugin<Project> {
 
     override fun apply(project: Project) {
 
         project.plugins.apply("maven-publish")
-        val extension = project.scientifik
-
-        project.afterEvaluate {
-
-            if (extension.kdoc) {
-                project.plugins.apply("org.jetbrains.dokka")
-            }
 
+        project.run {
             val bintrayRepo = if (project.version.toString().contains("dev")) {
                 "dev"
             } else {
-                project.bintrayRepo
+                findProperty("bintrayRepo") as? String
             }
 
-            val vcs = project.vcs
+            val githubProject = findProperty("githubProject") as? String
+            val vcs = findProperty("vcs") as? String
+                ?: githubProject?.let { "https://github.com/mipt-npm/$it" }
 
             if (vcs == null) {
                 project.logger.warn("[${project.name}] Missing deployment configuration. Skipping publish.")
-                return@afterEvaluate
+                return@apply
             }
 
             project.plugins.apply("com.jfrog.bintray")
@@ -102,8 +76,6 @@ open class ScientifikPublishPlugin : Plugin<Project> {
                 val githubUser: String? by project
                 val githubToken: String? by project
 
-                val githubProject = project.githubProject
-
                 if (githubProject != null && githubUser != null && githubToken != null) {
                     repositories {
                         val repository = maven {
@@ -130,96 +102,20 @@ open class ScientifikPublishPlugin : Plugin<Project> {
 
                     }
                 }
-            }
 
-            if (extension.kdoc) {
+                pluginManager.withPlugin("scientifik.mpp"){
-
+                    tasks.filter { it is ArtifactoryTask || it is BintrayUploadTask }.forEach {
-                extensions.findByType<KotlinMultiplatformExtension>()?.apply {
+                        it.doFirst {
-                    val dokka by tasks.getting(DokkaTask::class) {
+                            publications.filterIsInstance<MavenPublication>()
-                        outputFormat = "html"
+                                .forEach { publication ->
-                        outputDirectory = "$buildDir/javadoc"
+                                    val moduleFile =
-                        jdkVersion = 8
+                                        buildDir.resolve("publications/${publication.name}/module.json")
-
+                                    if (moduleFile.exists()) {
-                        kotlinTasks {
+                                        publication.artifact(object : FileBasedMavenArtifact(moduleFile) {
-                            // dokka fails to retrieve sources from MPP-tasks so we only define the jvm task
+                                            override fun getDefaultExtension() = "module"
-                            listOf(tasks.getByPath("compileKotlinJvm"))
+                                        })
-                        }
-                        sourceRoot {
-                            // assuming only single source dir
-                            path = sourceSets["commonMain"].kotlin.srcDirs.first().toString()
-                            platforms = listOf("Common")
-                        }
-                        // although the JVM sources are now taken from the task,
-                        // we still define the jvm source root to get the JVM marker in the generated html
-                        sourceRoot {
-                            // assuming only single source dir
-                            path = sourceSets["jvmMain"].kotlin.srcDirs.first().toString()
-                            platforms = listOf("JVM")
-                        }
-
-                    }
-
-                    val kdocJar by tasks.registering(Jar::class) {
-                        group = JavaBasePlugin.DOCUMENTATION_GROUP
-                        dependsOn(dokka)
-                        archiveClassifier.set("javadoc")
-                        from("$buildDir/javadoc")
-                    }
-
-                    configure<PublishingExtension> {
-
-                        targets.all {
-                            val publication = publications.findByName(name) as MavenPublication
-
-                            // Patch publications with fake javadoc
-                            publication.artifact(kdocJar.get())
-                        }
-
-                        tasks.filter { it is ArtifactoryTask || it is BintrayUploadTask }.forEach {
-                            it.doFirst {
-                                publications.filterIsInstance<MavenPublication>()
-                                    .forEach { publication ->
-                                        val moduleFile =
-                                            buildDir.resolve("publications/${publication.name}/module.json")
-                                        if (moduleFile.exists()) {
-                                            publication.artifact(object : FileBasedMavenArtifact(moduleFile) {
-                                                override fun getDefaultExtension() = "module"
-                                            })
-                                        }
                                     }
-                            }
+                                }
-                        }
-                    }
-                }
-
-
-                extensions.findByType<KotlinJvmProjectExtension>()?.apply {
-
-                    val sourcesJar by tasks.registering(Jar::class) {
-                        archiveClassifier.set("sources")
-                        from(sourceSets["main"].kotlin.srcDirs.first())
-                    }
-
-                    val dokka by tasks.getting(DokkaTask::class) {
-                        outputFormat = "html"
-                        outputDirectory = "$buildDir/javadoc"
-                        jdkVersion = 8
-                    }
-
-                    val kdocJar by tasks.registering(Jar::class) {
-                        group = JavaBasePlugin.DOCUMENTATION_GROUP
-                        dependsOn(dokka)
-                        archiveClassifier.set("javadoc")
-                        from("$buildDir/javadoc")
-                    }
-
-                    configure<PublishingExtension> {
-                        publications {
-                            register("jvm", MavenPublication::class) {
-                                from(components["java"])
-                                artifact(sourcesJar.get())
-                                artifact(kdocJar.get())
-                            }
                         }
                     }
                 }
@@ -287,6 +183,14 @@ open class ScientifikPublishPlugin : Plugin<Project> {
                     //workaround bintray bug
                     setPublications(*project.extensions.findByType<PublishingExtension>()!!.publications.names.toTypedArray())
                 }
+
+//                tasks.withType<BintrayUploadTask>{
+//                    doFirst {
+//                        logger.info("repoName = $repoName")
+//                        logger.info("versionName = $versionName")
+//                        logger.info("packageName = $packageName")
+//                    }
+//                }
             }
         }
     }