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 --- .../projects/it-multimodule-1/second/build.gradle | 14 -------------- .../second/src/main/kotlin/NoPackageClass.kt | 1 - .../second/src/main/kotlin/bar/SecondClass.kt | 21 --------------------- .../second/src/main/kotlin/foo/ThirdClass.kt | 11 ----------- 4 files changed, 47 deletions(-) delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/second/build.gradle delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/NoPackageClass.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/bar/SecondClass.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/foo/ThirdClass.kt (limited to 'integration-tests/gradle/projects/it-multimodule-1/second') diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle deleted file mode 100644 index 2b62f963..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -dependencies { - implementation project(":first") -} -dokkaHtml { - dependsOn(":first:dokkaHtml") - dokkaSourceSets { - "main" { - externalDocumentationLink { - url.set(new URL("file://" + rootProject.rootDir.toPath().toAbsolutePath().resolve("first/build/dokka/html/"))) - packageListUrl.set(new URL("file://" + rootProject.rootDir.toPath().toAbsolutePath().resolve("first/build/dokka/html/first/package-list"))) - } - } - } -} diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/NoPackageClass.kt b/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/NoPackageClass.kt deleted file mode 100644 index d2f30ef7..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/NoPackageClass.kt +++ /dev/null @@ -1 +0,0 @@ -class NoPackageClass : NoPackage() diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/bar/SecondClass.kt b/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/bar/SecondClass.kt deleted file mode 100644 index 6a0c935e..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/bar/SecondClass.kt +++ /dev/null @@ -1,21 +0,0 @@ -package bar -/** - * Second class in second module description [foo.FirstClass] - * @author John Doe - * @version 0.1.3 - * @param name Name description text text text. -*/ -class SecondClass(val name: String) { - val firstProperty = "propertystring" - /** - * Second property in second module description [foo.FirstSubclass] - */ - var secondProperty: String = "" - set(value) { - println("Second property not set") - } - - init { - println("InitializerBlock") - } -} diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/foo/ThirdClass.kt b/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/foo/ThirdClass.kt deleted file mode 100644 index cc24a6b7..00000000 --- a/integration-tests/gradle/projects/it-multimodule-1/second/src/main/kotlin/foo/ThirdClass.kt +++ /dev/null @@ -1,11 +0,0 @@ -package foo - -/** - * Third class description - */ -open class ThirdClass{ - /** - * PropertyOne description - */ - val propertyOne: Int = 5 -} \ No newline at end of file -- cgit