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 --- .../src/wasmJsMain/kotlin/RootPackageClass.kt | 30 ------------ .../src/wasmJsMain/kotlin/it/basic/PublicClass.kt | 53 ---------------------- .../wasmJsMain/kotlin/it/internal/InternalClass.kt | 7 --- .../it/suppressedByPackage/SuppressedByPackage.kt | 7 --- .../kotlin/it/suppressedByPath/SuppressedByPath.kt | 7 --- .../src/wasmWasiMain/kotlin/RootPackageClass.kt | 10 ---- .../wasmWasiMain/kotlin/it/basic/PublicClass.kt | 53 ---------------------- .../kotlin/it/internal/InternalClass.kt | 7 --- .../it/suppressedByPackage/SuppressedByPackage.kt | 7 --- .../kotlin/it/suppressedByPath/SuppressedByPath.kt | 7 --- 10 files changed, 188 deletions(-) delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/RootPackageClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/internal/InternalClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPath/SuppressedByPath.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/RootPackageClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/internal/InternalClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPath/SuppressedByPath.kt (limited to 'integration-tests/gradle/projects/it-wasm-js-wasi-basic/src') diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/RootPackageClass.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/RootPackageClass.kt deleted file mode 100644 index a2d05dff..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/RootPackageClass.kt +++ /dev/null @@ -1,30 +0,0 @@ -@file:Suppress("unused") - -import org.w3c.dom.HTMLAnchorElement -import kotlinx.coroutines.CoroutineScope - -/** - * A class that lives inside the root package - */ -class RootPackageClass { - val description = "I do live in the root package!" -} - -fun test(list: MutableList) = "list" - -@JsModule("is-sorted") -@JsNonModule -external fun sorted(a: Array): Boolean - -// this declaration can be used to check deserialization of dynamic type -external interface TextLinkProps: AnchorHTMLAttributes - -// this declaration uses external library and external documentation link -fun CoroutineScope.externalClass() = "some string" - -/** - * Some external function with JsFun - * @see kotlin.JsFun - */ -@kotlin.JsFun("xxx") -external fun externalFun() \ No newline at end of file diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/basic/PublicClass.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/basic/PublicClass.kt deleted file mode 100644 index fc4b36bd..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/basic/PublicClass.kt +++ /dev/null @@ -1,53 +0,0 @@ -@file:Suppress("unused") - -package it.basic - -import RootPackageClass - -/** - * This class, unlike [RootPackageClass] is located in a sub-package - */ -class PublicClass { - /** - * This function is public and documented - */ - fun publicDocumentedFunction(): String = "" - - fun publicUndocumentedFunction(): String = "" - - /** - * This function is internal and documented - */ - internal fun internalDocumentedFunction(): String = "" - - internal fun internalUndocumentedFunction(): String = "" - - /** - * This function is private and documented - */ - private fun privateDocumentedFunction(): String = "" - - private fun privateUndocumentedFunction(): String = "" - - - /** - * This property is public and documented - */ - val publicDocumentedProperty: Int = 0 - - val publicUndocumentedProperty: Int = 0 - - /** - * This property internal and documented - */ - val internalDocumentedProperty: Int = 0 - - val internalUndocumentedProperty: Int = 0 - - /** - * This property private and documented - */ - private val privateDocumentedProperty: Int = 0 - - private val privateUndocumentedProperty: Int = 0 -} diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/internal/InternalClass.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/internal/InternalClass.kt deleted file mode 100644 index 7d42b978..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/internal/InternalClass.kt +++ /dev/null @@ -1,7 +0,0 @@ -package it.internal - -/** - * §INTERNAL§ - * This class is internal and should not be rendered - */ -internal class InternalClass diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt deleted file mode 100644 index d8dc9cff..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package it.suppressedByPackage - -/** - * §SUPPRESSED§ - * This should not be rendered. - */ -class SuppressedByPackage diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPath/SuppressedByPath.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPath/SuppressedByPath.kt deleted file mode 100644 index 4dda9da4..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmJsMain/kotlin/it/suppressedByPath/SuppressedByPath.kt +++ /dev/null @@ -1,7 +0,0 @@ -package it.suppressedByPath - -/** - * §SUPPRESSED§ - * This should not be rendered. - */ -class SuppressedByPath diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/RootPackageClass.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/RootPackageClass.kt deleted file mode 100644 index 6735459c..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/RootPackageClass.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:Suppress("unused") - -/** - * A class that lives inside the root package - */ -class RootPackageClass { - val description = "I do live in the root package!" -} - -fun test(list: MutableList) = "list" \ No newline at end of file diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/basic/PublicClass.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/basic/PublicClass.kt deleted file mode 100644 index fc4b36bd..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/basic/PublicClass.kt +++ /dev/null @@ -1,53 +0,0 @@ -@file:Suppress("unused") - -package it.basic - -import RootPackageClass - -/** - * This class, unlike [RootPackageClass] is located in a sub-package - */ -class PublicClass { - /** - * This function is public and documented - */ - fun publicDocumentedFunction(): String = "" - - fun publicUndocumentedFunction(): String = "" - - /** - * This function is internal and documented - */ - internal fun internalDocumentedFunction(): String = "" - - internal fun internalUndocumentedFunction(): String = "" - - /** - * This function is private and documented - */ - private fun privateDocumentedFunction(): String = "" - - private fun privateUndocumentedFunction(): String = "" - - - /** - * This property is public and documented - */ - val publicDocumentedProperty: Int = 0 - - val publicUndocumentedProperty: Int = 0 - - /** - * This property internal and documented - */ - val internalDocumentedProperty: Int = 0 - - val internalUndocumentedProperty: Int = 0 - - /** - * This property private and documented - */ - private val privateDocumentedProperty: Int = 0 - - private val privateUndocumentedProperty: Int = 0 -} diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/internal/InternalClass.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/internal/InternalClass.kt deleted file mode 100644 index 7d42b978..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/internal/InternalClass.kt +++ /dev/null @@ -1,7 +0,0 @@ -package it.internal - -/** - * §INTERNAL§ - * This class is internal and should not be rendered - */ -internal class InternalClass diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt deleted file mode 100644 index d8dc9cff..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt +++ /dev/null @@ -1,7 +0,0 @@ -package it.suppressedByPackage - -/** - * §SUPPRESSED§ - * This should not be rendered. - */ -class SuppressedByPackage diff --git a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPath/SuppressedByPath.kt b/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPath/SuppressedByPath.kt deleted file mode 100644 index 4dda9da4..00000000 --- a/integration-tests/gradle/projects/it-wasm-js-wasi-basic/src/wasmWasiMain/kotlin/it/suppressedByPath/SuppressedByPath.kt +++ /dev/null @@ -1,7 +0,0 @@ -package it.suppressedByPath - -/** - * §SUPPRESSED§ - * This should not be rendered. - */ -class SuppressedByPath -- cgit