Move common-dependencies to a more relevant destination

Author: ileasile

gradle.properties

@@ -1,24 +1,22 @@
+baseVersion=0.10.0
+
 # kotlinVersion=1.5.255-SNAPSHOT
 kotlinVersion=1.6.0-dev-903
 stableKotlinVersion=1.5.20
-gradleKotlinVersion=1.4.31
-kotlinLanguageLevel=1.5
-stableKotlinLanguageLevel=1.5
-jvmTarget=1.8
 
-shadowJarVersion=7.0.0
-changelogPluginVersion=1.7.0
-kotlinxSerializationVersion=1.1.0
 ktlintGradleVersion=10.0.0
 ktlintVersion=0.40.0
 publishPluginVersion=0.0.29-dev
-junitVersion=5.7.1
-slf4jVersion=1.7.30
-logbackVersion=1.2.3
-http4kVersion=4.9.8.0
-artifactsPath=build/artifacts
+jupyterApiVersion=0.9.1-45
 
-baseVersion=0.10.0
+kotlinLanguageLevel=1.5
+stableKotlinLanguageLevel=1.5
+jvmTarget=1.8
+
+kotlin.jupyter.add.api=false
+kotlin.jupyter.add.scanner=false
+
+artifactsPath=build/artifacts
 
 githubRepoUser=Kotlin
 githubRepoName=kotlin-jupyter
@@ -33,7 +31,3 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m -Xmx2048m
 
 # Turn off README check when running check task
 skipReadmeCheck=false
-
-jupyterApiVersion=0.9.1-45
-kotlin.jupyter.add.api=false
-kotlin.jupyter.add.scanner=false

kotlin-jupyter-plugin/common-dependencies/src/main/kotlin/org/jetbrains/kotlinx/jupyter/common/ReplCommand.kt renamed to jupyter-lib/common-dependencies/src/main/kotlin/org/jetbrains/kotlinx/jupyter/common/ReplCommand.kt

@@ -7,10 +7,12 @@ plugins {
 
 repositories {
     mavenCentral()
+    gradlePluginPortal()
 }
 
 dependencies {
-    implementation(project(":common-dependencies"))
+    implementation(projects.commonDependencies)
+    api(libs.bundles.allGradlePlugins)
 }
 
 gradlePlugin {

kotlin-jupyter-plugin/common-dependencies/src/main/kotlin/org/jetbrains/kotlinx/jupyter/common/ReplEnum.kt renamed to jupyter-lib/common-dependencies/src/main/kotlin/org/jetbrains/kotlinx/jupyter/common/ReplEnum.kt

@@ -1,5 +1,13 @@
 @file:Suppress("UnstableApiUsage")
 
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
 pluginManagement {
     fun findRootProperties(): java.util.Properties {
         var fileName = "gradle.properties"
@@ -46,4 +54,9 @@ pluginManagement {
     }
 }
 
-include("common-dependencies")
+subproject("common-dependencies", "../jupyter-lib/")
+
+fun subproject(name: String, parentPath: String) {
+    include(name)
+    project(":$name").projectDir = file("$parentPath$name").absoluteFile
+}

kotlin-jupyter-plugin/common-dependencies/src/main/kotlin/org/jetbrains/kotlinx/jupyter/common/ReplLineMagic.kt renamed to jupyter-lib/common-dependencies/src/main/kotlin/org/jetbrains/kotlinx/jupyter/common/ReplLineMagic.kt

@@ -16,6 +16,18 @@ import org.jetbrains.kotlinx.jupyter.build.prepareReadmeTasks
 
 class KotlinJupyterGradlePlugin : Plugin<Project> {
     override fun apply(project: Project) {
+
+        with(project.plugins) {
+            apply("org.jetbrains.kotlin.jvm")
+            apply("com.github.johnrengelman.shadow")
+            apply("org.jetbrains.kotlin.plugin.serialization")
+            apply("org.jlleitschuh.gradle.ktlint")
+            apply("org.jetbrains.kotlinx.jupyter.dependencies")
+            apply("ru.ileasile.kotlin.publisher")
+            apply("ru.ileasile.kotlin.doc")
+            apply("org.hildan.github.changelog")
+        }
+
         with(ProjectWithOptionsImpl(project, project.options())) {
             /****** Helper tasks ******/
             prepareReadmeTasks()