From 8e5c63d035ef44a269b8c43430f43f5c8eebfb63 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Fri, 10 Nov 2023 11:46:54 +0100 Subject: Restructure the project to utilize included builds (#3174) * Refactor and simplify artifact publishing * Update Gradle to 8.4 * Refactor and simplify convention plugins and build scripts Fixes #3132 --------- Co-authored-by: Adam <897017+aSemy@users.noreply.github.com> Co-authored-by: Oleg Yukhnevich --- .../base/src/test/resources/linkable/includes/include1.md | 14 -------------- .../base/src/test/resources/linkable/includes/include11.md | 3 --- .../base/src/test/resources/linkable/includes/include2.md | 7 ------- .../resources/linkable/samples/jsMain/kotlin/JsClass.kt | 13 ------------- .../resources/linkable/samples/jsMain/resources/Samples.kt | 14 -------------- .../resources/linkable/samples/jvmMain/kotlin/JvmClass.kt | 13 ------------- .../linkable/samples/jvmMain/resources/Samples.kt | 14 -------------- .../resources/linkable/sources/jsMain/kotlin/JsClass.kt | 7 ------- .../resources/linkable/sources/jvmMain/kotlin/JvmClass.kt | 7 ------- 9 files changed, 92 deletions(-) delete mode 100644 plugins/base/src/test/resources/linkable/includes/include1.md delete mode 100644 plugins/base/src/test/resources/linkable/includes/include11.md delete mode 100644 plugins/base/src/test/resources/linkable/includes/include2.md delete mode 100644 plugins/base/src/test/resources/linkable/samples/jsMain/kotlin/JsClass.kt delete mode 100644 plugins/base/src/test/resources/linkable/samples/jsMain/resources/Samples.kt delete mode 100644 plugins/base/src/test/resources/linkable/samples/jvmMain/kotlin/JvmClass.kt delete mode 100644 plugins/base/src/test/resources/linkable/samples/jvmMain/resources/Samples.kt delete mode 100644 plugins/base/src/test/resources/linkable/sources/jsMain/kotlin/JsClass.kt delete mode 100644 plugins/base/src/test/resources/linkable/sources/jvmMain/kotlin/JvmClass.kt (limited to 'plugins/base/src/test/resources/linkable') diff --git a/plugins/base/src/test/resources/linkable/includes/include1.md b/plugins/base/src/test/resources/linkable/includes/include1.md deleted file mode 100644 index 09882ec1..00000000 --- a/plugins/base/src/test/resources/linkable/includes/include1.md +++ /dev/null @@ -1,14 +0,0 @@ -# Module example - -This is JVM documentation for module example - -# Package example - -This is JVM documentation for package example - -## Example - -```kotlin -\@SqlTable(People::class) -class Person(val name: String, uuid: UUID = UUID.randomUUID()) : Entity(uuid) -``` diff --git a/plugins/base/src/test/resources/linkable/includes/include11.md b/plugins/base/src/test/resources/linkable/includes/include11.md deleted file mode 100644 index fa27b23d..00000000 --- a/plugins/base/src/test/resources/linkable/includes/include11.md +++ /dev/null @@ -1,3 +0,0 @@ -# Module example - -This is second JVM documentation for module example diff --git a/plugins/base/src/test/resources/linkable/includes/include2.md b/plugins/base/src/test/resources/linkable/includes/include2.md deleted file mode 100644 index 1574003d..00000000 --- a/plugins/base/src/test/resources/linkable/includes/include2.md +++ /dev/null @@ -1,7 +0,0 @@ -# Module example - -This is JS documentation for module example - -# Package greeteer - -This is JS documentation for package greeteer \ No newline at end of file diff --git a/plugins/base/src/test/resources/linkable/samples/jsMain/kotlin/JsClass.kt b/plugins/base/src/test/resources/linkable/samples/jsMain/kotlin/JsClass.kt deleted file mode 100644 index 62a961c1..00000000 --- a/plugins/base/src/test/resources/linkable/samples/jsMain/kotlin/JsClass.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package p2 - -class JsClass { - - /** - * @sample samples.SamplesJs.exampleUsage - */ - fun printWithExclamation(msg: String) = println("$msg!") -} diff --git a/plugins/base/src/test/resources/linkable/samples/jsMain/resources/Samples.kt b/plugins/base/src/test/resources/linkable/samples/jsMain/resources/Samples.kt deleted file mode 100644 index 5dc791d7..00000000 --- a/plugins/base/src/test/resources/linkable/samples/jsMain/resources/Samples.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package samples - -import p2.JsClass - -class SamplesJs { - - fun exampleUsage() { - JsClass().printWithExclamation("Hi, Js") - } -} diff --git a/plugins/base/src/test/resources/linkable/samples/jvmMain/kotlin/JvmClass.kt b/plugins/base/src/test/resources/linkable/samples/jvmMain/kotlin/JvmClass.kt deleted file mode 100644 index 0014cdb7..00000000 --- a/plugins/base/src/test/resources/linkable/samples/jvmMain/kotlin/JvmClass.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package p2 - -class JvmClass { - - /** - * @sample samples.SamplesJvm.exampleUsage - */ - fun printWithExclamation(msg: String) = println("$msg!") -} diff --git a/plugins/base/src/test/resources/linkable/samples/jvmMain/resources/Samples.kt b/plugins/base/src/test/resources/linkable/samples/jvmMain/resources/Samples.kt deleted file mode 100644 index f32538cc..00000000 --- a/plugins/base/src/test/resources/linkable/samples/jvmMain/resources/Samples.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package samples - -import p2.JvmClass - -class SamplesJvm { - - fun exampleUsage() { - JvmClass().printWithExclamation("Hi, Jvm") - } -} diff --git a/plugins/base/src/test/resources/linkable/sources/jsMain/kotlin/JsClass.kt b/plugins/base/src/test/resources/linkable/sources/jsMain/kotlin/JsClass.kt deleted file mode 100644 index 180d9519..00000000 --- a/plugins/base/src/test/resources/linkable/sources/jsMain/kotlin/JsClass.kt +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package p1 - -class JsClass diff --git a/plugins/base/src/test/resources/linkable/sources/jvmMain/kotlin/JvmClass.kt b/plugins/base/src/test/resources/linkable/sources/jvmMain/kotlin/JvmClass.kt deleted file mode 100644 index 3adf9520..00000000 --- a/plugins/base/src/test/resources/linkable/sources/jvmMain/kotlin/JvmClass.kt +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package p1 - -class JvmClass -- cgit