diff --git a/libraries/apidoc/pom.xml b/libraries/docs/apidoc/pom.xml similarity index 82% rename from libraries/apidoc/pom.xml rename to libraries/docs/apidoc/pom.xml index 37de80df542..2c78b20cabc 100644 --- a/libraries/apidoc/pom.xml +++ b/libraries/docs/apidoc/pom.xml @@ -6,8 +6,8 @@ 4.0.0 - org.jetbrains.kotlin - kotlin-project + org.jetbrains.kotlin.docs + docs 1.0-SNAPSHOT @@ -34,10 +34,10 @@ ${project.version} - ${basedir}/../stdlib/src - ${basedir}/../kunit/src/main/kotlin - ${basedir}/../kotlin-jdbc/src/main/kotlin - ${basedir}/../kotlin-swing/src/main/kotlin + ${basedir}/../../stdlib/src + ${basedir}/../../kunit/src/main/kotlin + ${basedir}/../../kotlin-jdbc/src/main/kotlin + ${basedir}/../../kotlin-swing/src/main/kotlin Kotlin API (${project.version}) diff --git a/libraries/docs/pom.xml b/libraries/docs/pom.xml new file mode 100644 index 00000000000..29b32d07690 --- /dev/null +++ b/libraries/docs/pom.xml @@ -0,0 +1,26 @@ + + + + 4.0.0 + + + org.jetbrains.kotlin + kotlin-project + 1.0-SNAPSHOT + + + org.jetbrains.kotlin.docs + docs + pom + + + ${project.basedir}/../.. + + + + apidoc + website + + diff --git a/libraries/website/pom.xml b/libraries/docs/website/pom.xml similarity index 77% rename from libraries/website/pom.xml rename to libraries/docs/website/pom.xml index b2f3339fb4d..d9530b356ca 100644 --- a/libraries/website/pom.xml +++ b/libraries/docs/website/pom.xml @@ -6,8 +6,8 @@ 4.0.0 - org.jetbrains.kotlin - kotlin-project + org.jetbrains.kotlin.docs + docs 1.0-SNAPSHOT @@ -24,26 +24,6 @@ pegdown ${pegdown.version} - - - org.jetbrains.kotlin - kdoc - ${project.version} - test - - - - asm - asm-util - 3.3 - test - - - asm - asm-commons - 3.3 - test - diff --git a/libraries/website/src/main/apidocs/kotlin.css b/libraries/docs/website/src/main/apidocs/kotlin.css similarity index 100% rename from libraries/website/src/main/apidocs/kotlin.css rename to libraries/docs/website/src/main/apidocs/kotlin.css diff --git a/libraries/website/src/main/apidocs/resources/bkg_blkheader.png b/libraries/docs/website/src/main/apidocs/resources/bkg_blkheader.png similarity index 100% rename from libraries/website/src/main/apidocs/resources/bkg_blkheader.png rename to libraries/docs/website/src/main/apidocs/resources/bkg_blkheader.png diff --git a/libraries/website/src/main/apidocs/resources/bkg_gradient.gif b/libraries/docs/website/src/main/apidocs/resources/bkg_gradient.gif similarity index 100% rename from libraries/website/src/main/apidocs/resources/bkg_gradient.gif rename to libraries/docs/website/src/main/apidocs/resources/bkg_gradient.gif diff --git a/libraries/website/src/main/apidocs/resources/bkgheader.png b/libraries/docs/website/src/main/apidocs/resources/bkgheader.png similarity index 100% rename from libraries/website/src/main/apidocs/resources/bkgheader.png rename to libraries/docs/website/src/main/apidocs/resources/bkgheader.png diff --git a/libraries/website/src/main/apidocs/resources/inherit.gif b/libraries/docs/website/src/main/apidocs/resources/inherit.gif similarity index 100% rename from libraries/website/src/main/apidocs/resources/inherit.gif rename to libraries/docs/website/src/main/apidocs/resources/inherit.gif diff --git a/libraries/website/src/main/apidocs/resources/underline.gif b/libraries/docs/website/src/main/apidocs/resources/underline.gif similarity index 100% rename from libraries/website/src/main/apidocs/resources/underline.gif rename to libraries/docs/website/src/main/apidocs/resources/underline.gif diff --git a/libraries/website/src/main/apidocs/stylesheet.css b/libraries/docs/website/src/main/apidocs/stylesheet.css similarity index 100% rename from libraries/website/src/main/apidocs/stylesheet.css rename to libraries/docs/website/src/main/apidocs/stylesheet.css diff --git a/libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt b/libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt similarity index 100% rename from libraries/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt rename to libraries/docs/website/src/main/kotlin/org/jetbrains/kotlin/site/SiteGenerator.kt diff --git a/libraries/website/src/main/templates/css/bootstrap-responsive.css b/libraries/docs/website/src/main/templates/css/bootstrap-responsive.css similarity index 100% rename from libraries/website/src/main/templates/css/bootstrap-responsive.css rename to libraries/docs/website/src/main/templates/css/bootstrap-responsive.css diff --git a/libraries/website/src/main/templates/css/bootstrap-responsive.min.css b/libraries/docs/website/src/main/templates/css/bootstrap-responsive.min.css similarity index 100% rename from libraries/website/src/main/templates/css/bootstrap-responsive.min.css rename to libraries/docs/website/src/main/templates/css/bootstrap-responsive.min.css diff --git a/libraries/website/src/main/templates/css/bootstrap.css b/libraries/docs/website/src/main/templates/css/bootstrap.css similarity index 100% rename from libraries/website/src/main/templates/css/bootstrap.css rename to libraries/docs/website/src/main/templates/css/bootstrap.css diff --git a/libraries/website/src/main/templates/css/bootstrap.min.css b/libraries/docs/website/src/main/templates/css/bootstrap.min.css similarity index 100% rename from libraries/website/src/main/templates/css/bootstrap.min.css rename to libraries/docs/website/src/main/templates/css/bootstrap.min.css diff --git a/libraries/website/src/main/templates/developers.md b/libraries/docs/website/src/main/templates/developers.md similarity index 100% rename from libraries/website/src/main/templates/developers.md rename to libraries/docs/website/src/main/templates/developers.md diff --git a/libraries/website/src/main/templates/img/glyphicons-halflings-white.png b/libraries/docs/website/src/main/templates/img/glyphicons-halflings-white.png similarity index 100% rename from libraries/website/src/main/templates/img/glyphicons-halflings-white.png rename to libraries/docs/website/src/main/templates/img/glyphicons-halflings-white.png diff --git a/libraries/website/src/main/templates/img/glyphicons-halflings.png b/libraries/docs/website/src/main/templates/img/glyphicons-halflings.png similarity index 100% rename from libraries/website/src/main/templates/img/glyphicons-halflings.png rename to libraries/docs/website/src/main/templates/img/glyphicons-halflings.png diff --git a/libraries/website/src/main/templates/index.html b/libraries/docs/website/src/main/templates/index.html similarity index 100% rename from libraries/website/src/main/templates/index.html rename to libraries/docs/website/src/main/templates/index.html diff --git a/libraries/website/src/main/templates/js/bootstrap.js b/libraries/docs/website/src/main/templates/js/bootstrap.js similarity index 100% rename from libraries/website/src/main/templates/js/bootstrap.js rename to libraries/docs/website/src/main/templates/js/bootstrap.js diff --git a/libraries/website/src/main/templates/js/bootstrap.min.js b/libraries/docs/website/src/main/templates/js/bootstrap.min.js similarity index 100% rename from libraries/website/src/main/templates/js/bootstrap.min.js rename to libraries/docs/website/src/main/templates/js/bootstrap.min.js diff --git a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt b/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt similarity index 82% rename from libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt rename to libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt index e31df954dd3..49295acc11e 100644 --- a/libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt +++ b/libraries/docs/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt @@ -1,9 +1,8 @@ package org.jetbrains.kotlin.site +import kotlin.test.* import junit.framework.TestCase import java.io.File -import org.jetbrains.kotlin.doc.KDocArguments -import org.jetbrains.kotlin.doc.KDocCompiler class GenerateSiteTest : TestCase() { val srcDir = findTemplateDir() @@ -17,6 +16,20 @@ class GenerateSiteTest : TestCase() { generator.run() } + fun testCopyApiDocs(): Unit { + val outDir = File(siteOutputDir, "versions/$versionDir/apidocs") + println("Generating library KDocs to $outDir") + + copyDocResources(outDir) + + val apidocDir = File(siteOutputDir, "../../../apidoc/target/site/apidocs") + assertTrue(apidocDir.exists(), "Directory does not exist ${apidocDir.getCanonicalPath()}") + + + copyRecursive(apidocDir, outDir) + } + + /* fun testGenerateStdlibKDoc(): Unit { val outDir = File(siteOutputDir, "versions/$versionDir/apidocs") println("Generating library KDocs to $outDir") @@ -64,9 +77,16 @@ class GenerateSiteTest : TestCase() { val compiler = KDocCompiler() compiler.exec(System.out, args) } + */ fun copyDocResources(outDir: File): Unit { val sourceDir = File(srcDir, "../apidocs") + copyRecursive(sourceDir, outDir) + } + + + // TODO this would make a handy extension function on File :) + fun copyRecursive(sourceDir: File, outDir: File): Unit { sourceDir.recurse { if (it.isFile()) { var relativePath = sourceDir.relativePath(it) @@ -77,7 +97,6 @@ class GenerateSiteTest : TestCase() { } } - fun findTemplateDir(): File { val path = "src/main/templates" for (p in arrayList(".", "website", "library/website")) { diff --git a/libraries/kotlin-java/pom.xml b/libraries/examples/kotlin-java-example/pom.xml similarity index 79% rename from libraries/kotlin-java/pom.xml rename to libraries/examples/kotlin-java-example/pom.xml index 1ded3cf61a8..24f9fee029f 100644 --- a/libraries/kotlin-java/pom.xml +++ b/libraries/examples/kotlin-java-example/pom.xml @@ -11,7 +11,10 @@ 1.0-SNAPSHOT - kotlin-java + kotlin-java-example + + This example shows how the standard kotlin API can be easily used from Java code; + its maybe more verbose and not as kool, but still very functional diff --git a/libraries/kotlin-java/src/test/java/test/kotlin/jtests/CollectionTest.java b/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java similarity index 100% rename from libraries/kotlin-java/src/test/java/test/kotlin/jtests/CollectionTest.java rename to libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java diff --git a/libraries/examples/pom.xml b/libraries/examples/pom.xml index 4b3efbb189e..352e59b82d7 100644 --- a/libraries/examples/pom.xml +++ b/libraries/examples/pom.xml @@ -20,6 +20,7 @@ + kotlin-java-example js-example diff --git a/libraries/pom.xml b/libraries/pom.xml index f8c358cfa4a..189d19ff10f 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -29,18 +29,14 @@ - kotlin-install - runtime - kotlin-maven-plugin - kdoc-maven-plugin + tools + kunit stdlib - kdoc kotlin-jdbc - kotlin-java kotlin-swing - website - apidoc + + docs examples diff --git a/libraries/kdoc-maven-plugin/ReadMe.md b/libraries/tools/kdoc-maven-plugin/ReadMe.md similarity index 100% rename from libraries/kdoc-maven-plugin/ReadMe.md rename to libraries/tools/kdoc-maven-plugin/ReadMe.md diff --git a/libraries/kdoc-maven-plugin/pom.xml b/libraries/tools/kdoc-maven-plugin/pom.xml similarity index 97% rename from libraries/kdoc-maven-plugin/pom.xml rename to libraries/tools/kdoc-maven-plugin/pom.xml index 7f38078528e..9d14a87f3d3 100644 --- a/libraries/kdoc-maven-plugin/pom.xml +++ b/libraries/tools/kdoc-maven-plugin/pom.xml @@ -11,7 +11,7 @@ org.jetbrains.kotlin - kotlin-project + tools 1.0-SNAPSHOT diff --git a/libraries/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java b/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java similarity index 100% rename from libraries/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java rename to libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java diff --git a/libraries/kdoc-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java b/libraries/tools/kdoc-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java similarity index 100% rename from libraries/kdoc-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java rename to libraries/tools/kdoc-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java diff --git a/libraries/kdoc/.gitignore b/libraries/tools/kdoc/.gitignore similarity index 100% rename from libraries/kdoc/.gitignore rename to libraries/tools/kdoc/.gitignore diff --git a/libraries/kdoc/ApiDocsModule.kt b/libraries/tools/kdoc/ApiDocsModule.kt similarity index 100% rename from libraries/kdoc/ApiDocsModule.kt rename to libraries/tools/kdoc/ApiDocsModule.kt diff --git a/libraries/kdoc/module.kt b/libraries/tools/kdoc/module.kt similarity index 100% rename from libraries/kdoc/module.kt rename to libraries/tools/kdoc/module.kt diff --git a/libraries/kdoc/pom.xml b/libraries/tools/kdoc/pom.xml similarity index 97% rename from libraries/kdoc/pom.xml rename to libraries/tools/kdoc/pom.xml index db9a493deec..fb8b60f8913 100644 --- a/libraries/kdoc/pom.xml +++ b/libraries/tools/kdoc/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin - kotlin-project + tools 1.0-SNAPSHOT diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/Doclet.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocConfig.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/AllClassesFrameTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassExtensionsTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/ClassTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/HelpDocTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/IndexTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewFrameTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewTreeTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageListTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageSummaryTemplate.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt diff --git a/libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt similarity index 100% rename from libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt rename to libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/template/TemplateCore.kt diff --git a/libraries/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt similarity index 100% rename from libraries/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt rename to libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt diff --git a/libraries/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt similarity index 100% rename from libraries/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt rename to libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt diff --git a/libraries/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt similarity index 100% rename from libraries/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt rename to libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/PegdownTest.kt diff --git a/libraries/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt similarity index 100% rename from libraries/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt rename to libraries/tools/kdoc/src/test/kotlin/test/kotlin/template/TemplateCoreTest.kt diff --git a/libraries/kdoc/src/test/sample/Hello.kt b/libraries/tools/kdoc/src/test/sample/Hello.kt similarity index 100% rename from libraries/kdoc/src/test/sample/Hello.kt rename to libraries/tools/kdoc/src/test/sample/Hello.kt diff --git a/libraries/kotlin-install/pom.xml b/libraries/tools/kotlin-install/pom.xml similarity index 99% rename from libraries/kotlin-install/pom.xml rename to libraries/tools/kotlin-install/pom.xml index 6d5cb19f168..bdf436c311a 100644 --- a/libraries/kotlin-install/pom.xml +++ b/libraries/tools/kotlin-install/pom.xml @@ -11,7 +11,7 @@ org.jetbrains.kotlin - kotlin-project + tools 1.0-SNAPSHOT diff --git a/libraries/kotlin-maven-plugin/ReadMe.md b/libraries/tools/kotlin-maven-plugin/ReadMe.md similarity index 100% rename from libraries/kotlin-maven-plugin/ReadMe.md rename to libraries/tools/kotlin-maven-plugin/ReadMe.md diff --git a/libraries/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml similarity index 99% rename from libraries/kotlin-maven-plugin/pom.xml rename to libraries/tools/kotlin-maven-plugin/pom.xml index 9ad52cdd1a3..9f57ea5de85 100644 --- a/libraries/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -11,7 +11,7 @@ org.jetbrains.kotlin - kotlin-project + tools 1.0-SNAPSHOT diff --git a/libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java similarity index 100% rename from libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java rename to libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java diff --git a/libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java similarity index 100% rename from libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java rename to libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java diff --git a/libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java similarity index 100% rename from libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java rename to libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojo.java diff --git a/libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java similarity index 100% rename from libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java rename to libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java diff --git a/libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java similarity index 100% rename from libraries/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java rename to libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java diff --git a/libraries/kotlin-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java b/libraries/tools/kotlin-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java similarity index 100% rename from libraries/kotlin-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java rename to libraries/tools/kotlin-maven-plugin/src/test/java/org/jetbrains/kotlin/maven/MojoTest.java diff --git a/libraries/tools/pom.xml b/libraries/tools/pom.xml new file mode 100644 index 00000000000..8820fa9f78c --- /dev/null +++ b/libraries/tools/pom.xml @@ -0,0 +1,29 @@ + + + + 4.0.0 + + + org.jetbrains.kotlin + kotlin-project + 1.0-SNAPSHOT + + + org.jetbrains.kotlin + tools + pom + + + ${project.basedir}/../.. + + + + kotlin-install + runtime + kotlin-maven-plugin + kdoc + kdoc-maven-plugin + + diff --git a/libraries/runtime/pom.xml b/libraries/tools/runtime/pom.xml similarity index 96% rename from libraries/runtime/pom.xml rename to libraries/tools/runtime/pom.xml index 4a78222c66c..cc89f9332e9 100644 --- a/libraries/runtime/pom.xml +++ b/libraries/tools/runtime/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin - kotlin-project + tools 1.0-SNAPSHOT