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 --- integration-tests/aws_sync.sh | 38 --- integration-tests/build.gradle.kts | 18 - integration-tests/cli/build.gradle.kts | 52 --- .../main/java/it/basic/java/SampleJavaClass.java | 17 - .../src/main/kotlin/it/basic/EmptyPackage.kt | 1 - .../it-cli/src/main/kotlin/it/basic/PublicClass.kt | 57 ---- .../src/main/kotlin/it/internal/InternalClass.kt | 7 - .../it/overriddenVisibility/VisiblePrivateClass.kt | 12 - .../src/main/kotlin/it/protected/ProtectedClass.kt | 10 - .../jetbrains/dokka/it/cli/CliIntegrationTest.kt | 377 --------------------- .../org/jetbrains/dokka/it/cli/jsonBuilder.kt | 56 --- .../cli/src/integrationTest/resources/my-file.json | 0 .../dokka/it/cli/AbstractCliIntegrationTest.kt | 40 --- integration-tests/gradle/README.md | 21 -- integration-tests/gradle/build.gradle.kts | 35 -- .../gradle/projects/coroutines/coroutines.diff | 70 ---- .../gradle/projects/coroutines/kotlinx-coroutines | 1 - .../projects/coroutines/template.root.gradle.kts | 1 - .../coroutines/template.settings.gradle.kts | 1 - .../gradle/projects/it-android-0/build.gradle.kts | 22 -- .../gradle/projects/it-android-0/gradle.properties | 7 - .../it-android-0/gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-android-0/gradlew | 183 ---------- .../gradle/projects/it-android-0/gradlew.bat | 100 ------ .../projects/it-android-0/settings.gradle.kts | 9 - .../it-android-0/src/main/AndroidManifest.xml | 5 - .../main/java/it/android/AndroidSpecificClass.kt | 16 - .../java/it/android/IntegrationTestActivity.kt | 22 -- .../gradle/projects/it-basic-groovy/build.gradle | 54 --- .../projects/it-basic-groovy/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-basic-groovy/gradlew | 185 ---------- .../gradle/projects/it-basic-groovy/gradlew.bat | 104 ------ .../projects/it-basic-groovy/settings.gradle.kts | 9 - .../main/java/it/basic/java/SampleJavaClass.java | 17 - .../src/main/kotlin/it/basic/PublicClass.kt | 48 --- .../gradle/projects/it-basic/build.gradle.kts | 67 ---- .../it-basic/customResources/custom-resource.svg | 7 - .../customResources/custom-style-to-add.css | 5 - .../it-basic/customResources/logo-styles.css | 7 - .../gradle/projects/it-basic/gradle.properties | 5 - .../it-basic/gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - integration-tests/gradle/projects/it-basic/gradlew | 185 ---------- .../gradle/projects/it-basic/gradlew.bat | 104 ------ .../gradle/projects/it-basic/settings.gradle.kts | 9 - .../main/java/it/basic/java/SampleJavaClass.java | 17 - .../it-basic/src/main/kotlin/RootPackageClass.kt | 8 - .../src/main/kotlin/it/basic/PublicClass.kt | 69 ---- .../src/main/kotlin/it/internal/InternalClass.kt | 7 - .../it/overriddenVisibility/VisiblePrivateClass.kt | 12 - .../src/main/kotlin/it/protected/ProtectedClass.kt | 10 - .../it/suppressedByPackage/SuppressedByPackage.kt | 7 - .../kotlin/it/suppressedByPath/SuppressedByPath.kt | 7 - .../it-basic/src/test/kotlin/it/basic/TestClass.kt | 17 - .../projects/it-collector-0/build.gradle.kts | 5 - .../projects/it-collector-0/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-collector-0/gradlew | 183 ---------- .../gradle/projects/it-collector-0/gradlew.bat | 100 ------ .../it-collector-0/moduleA/build.gradle.kts | 10 - .../it-collector-0/moduleA/moduleB/README.md | 2 - .../moduleA/moduleB/build.gradle.kts | 8 - .../org/jetbrains/dokka/it/moduleB/ModuleB.kt | 6 - .../it-collector-0/moduleA/moduleC/README.md | 2 - .../moduleA/moduleC/build.gradle.kts | 8 - .../org/jetbrains/dokka/it/moduleC/ModuleC.kt | 6 - .../projects/it-collector-0/settings.gradle.kts | 9 - .../gradle/projects/it-configuration/README.md | 5 - .../projects/it-configuration/build.gradle.kts | 33 -- .../projects/it-configuration/gradle.properties | 7 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-configuration/gradlew | 185 ---------- .../gradle/projects/it-configuration/gradlew.bat | 104 ------ .../projects/it-configuration/settings.gradle.kts | 7 - .../kotlin/it/ClassWithUndocumentedDeclarations.kt | 12 - .../gradle/projects/it-js-ir-0/build.gradle.kts | 25 -- .../gradle/projects/it-js-ir-0/gradle.properties | 6 - .../it-js-ir-0/gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-js-ir-0/gradlew | 185 ---------- .../gradle/projects/it-js-ir-0/gradlew.bat | 104 ------ .../gradle/projects/it-js-ir-0/settings.gradle.kts | 9 - .../it-js-ir-0/src/main/kotlin/RootPackageClass.kt | 26 -- .../src/main/kotlin/it/basic/PublicClass.kt | 53 --- .../src/main/kotlin/it/internal/InternalClass.kt | 7 - .../it/suppressedByPackage/SuppressedByPackage.kt | 7 - .../kotlin/it/suppressedByPath/SuppressedByPath.kt | 7 - .../projects/it-multimodule-0/build.gradle.kts | 5 - .../projects/it-multimodule-0/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-multimodule-0/gradlew | 183 ---------- .../gradle/projects/it-multimodule-0/gradlew.bat | 100 ------ .../it-multimodule-0/moduleA/build.gradle.kts | 20 -- .../it-multimodule-0/moduleA/moduleB/Module.md | 6 - .../moduleA/moduleB/build.gradle.kts | 17 - .../org/jetbrains/dokka/it/moduleB/ModuleB.kt | 6 - .../it-multimodule-0/moduleA/moduleC/Module.md | 2 - .../moduleA/moduleC/build.gradle.kts | 16 - .../org/jetbrains/dokka/it/moduleC/ModuleC.kt | 6 - .../moduleA/moduleD/build.gradle.kts | 10 - .../org/jetbrains/dokka/it/moduleD/ModuleC.kt | 6 - .../projects/it-multimodule-0/settings.gradle.kts | 10 - .../gradle/projects/it-multimodule-1/build.gradle | 18 - .../projects/it-multimodule-1/first/build.gradle | 0 .../first/src/main/kotlin/foo/FirstClass.kt | 11 - .../first/src/main/kotlin/foo/FirstSubclass.kt | 12 - .../first/src/main/kotlin/foo/Main.kt | 8 - .../first/src/main/kotlin/noPackage.kt | 3 - .../projects/it-multimodule-1/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-multimodule-1/gradlew | 185 ---------- .../gradle/projects/it-multimodule-1/gradlew.bat | 104 ------ .../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 - .../projects/it-multimodule-1/settings.gradle.kts | 8 - .../it-multimodule-versioning-0/build.gradle | 43 --- .../it-multimodule-versioning-0/first/build.gradle | 0 .../first/src/main/kotlin/foo/FirstClass.kt | 11 - .../it-multimodule-versioning-0/gradle.properties | 6 - .../gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 10 - .../projects/it-multimodule-versioning-0/gradlew | 244 ------------- .../it-multimodule-versioning-0/gradlew.bat | 92 ----- .../second/build.gradle | 3 - .../second/src/main/kotlin/bar/SecondClass.kt | 21 -- .../settings.gradle.kts | 8 - .../projects/it-multiplatform-0/build.gradle.kts | 52 --- .../projects/it-multiplatform-0/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-multiplatform-0/gradlew | 183 ---------- .../gradle/projects/it-multiplatform-0/gradlew.bat | 100 ------ .../it-multiplatform-0/settings.gradle.kts | 6 - .../commonMain/kotlin/it/mpp0/CommonMainClass.kt | 8 - .../src/commonMain/kotlin/it/mpp0/ExpectedClass.kt | 5 - .../src/commonMain/kotlin/it/mpp0/coroutines.kt | 5 - .../kotlin/it/mpp0/CPointerExtension.kt | 11 - .../desktopMain/kotlin/it/mpp0/ExpectedClass.kt | 5 - .../src/jsMain/kotlin/it/mpp0/ExpectedClass.kt | 5 - .../src/jsMain/kotlin/it/mpp0/runBlocking.kt | 7 - .../src/jvmMain/kotlin/it/mpp0/ExpectedClass.kt | 11 - .../src/jvmMain/kotlin/it/mpp0/JvmOnlyClass.kt | 13 - .../src/jvmMain/kotlin/it/mpp0/runBlocking.kt | 7 - .../linuxMain/kotlin/it/mpp0/CPointerExtension.kt | 11 - .../src/linuxMain/kotlin/it/mpp0/ExpectedClass.kt | 5 - .../src/linuxMain/kotlin/it/mpp0/runBlocking.kt | 13 - .../src/macosMain/kotlin/it/mpp0/ExpectedClass.kt | 5 - .../src/macosMain/kotlin/it/mpp0/runBlocking.kt | 7 - .../build.gradle.kts | 44 --- .../gradle.properties | 6 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../it-sequential-tasks-execution-stress/gradlew | 185 ---------- .../gradlew.bat | 104 ------ .../settings.gradle.kts | 9 - .../main/java/it/basic/java/SampleJavaClass.java | 17 - .../src/main/kotlin/RootPackageClass.kt | 8 - .../gradle/projects/it-wasm-basic/build.gradle.kts | 51 --- .../projects/it-wasm-basic/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-wasm-basic/gradlew | 183 ---------- .../gradle/projects/it-wasm-basic/gradlew.bat | 100 ------ .../projects/it-wasm-basic/settings.gradle.kts | 6 - .../src/wasmMain/kotlin/RootPackageClass.kt | 30 -- .../src/wasmMain/kotlin/it/basic/PublicClass.kt | 53 --- .../wasmMain/kotlin/it/internal/InternalClass.kt | 7 - .../it/suppressedByPackage/SuppressedByPackage.kt | 7 - .../kotlin/it/suppressedByPath/SuppressedByPath.kt | 7 - .../it-wasm-js-wasi-basic/build.gradle.kts | 40 --- .../it-wasm-js-wasi-basic/gradle.properties | 5 - .../gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 9 - .../gradle/projects/it-wasm-js-wasi-basic/gradlew | 183 ---------- .../projects/it-wasm-js-wasi-basic/gradlew.bat | 100 ------ .../it-wasm-js-wasi-basic/settings.gradle.kts | 6 - .../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 - .../projects/serialization/kotlinx-serialization | 1 - .../projects/serialization/serialization.diff | 13 - .../serialization/template.root.gradle.kts | 1 - .../serialization/template.settings.gradle.kts | 1 - .../gradle/projects/template.root.gradle.kts | 24 -- .../gradle/projects/template.settings.gradle.kts | 39 --- .../dokka/it/StdLibDocumentationIntegrationTest.kt | 42 --- .../gradle/AbstractGradleCachingIntegrationTest.kt | 142 -------- .../it/gradle/Android0GradleIntegrationTest.kt | 100 ------ .../dokka/it/gradle/BasicCachingIntegrationTest.kt | 74 ---- .../dokka/it/gradle/BasicGradleIntegrationTest.kt | 201 ----------- .../dokka/it/gradle/BasicGroovyIntegrationTest.kt | 96 ------ .../dokka/it/gradle/Collector0IntegrationTest.kt | 83 ----- .../jetbrains/dokka/it/gradle/ConfigurationTest.kt | 76 ----- .../GradleRelocatedCachingIntegrationTest.kt | 38 --- .../dokka/it/gradle/JsIRGradleIntegrationTest.kt | 67 ---- .../dokka/it/gradle/MultiModule0IntegrationTest.kt | 103 ------ .../dokka/it/gradle/MultiModule1IntegrationTest.kt | 58 ---- .../gradle/Multiplatform0GradleIntegrationTest.kt | 57 ---- .../gradle/SequentialTasksExecutionStressTest.kt | 48 --- .../jetbrains/dokka/it/gradle/TestedVersions.kt | 72 ---- .../dokka/it/gradle/Versioning0IntegrationTest.kt | 87 ----- .../dokka/it/gradle/WasmGradleIntegrationTest.kt | 66 ---- .../it/gradle/WasmJsWasiGradleIntegrationTest.kt | 65 ---- .../kotlin/CoroutinesGradleIntegrationTest.kt | 70 ---- .../kotlin/SerializationGradleIntegrationTest.kt | 64 ---- .../it/gradle/AbstractGradleIntegrationTest.kt | 84 ----- .../org/jetbrains/dokka/it/gradle/BuildVersions.kt | 52 --- .../jetbrains/dokka/it/gradle/TestEnvironment.kt | 18 - integration-tests/maven/build.gradle.kts | 30 -- integration-tests/maven/projects/biojava/biojava | 1 - .../maven/projects/biojava/biojava.diff | 37 -- .../it-maven/customResources/custom-resource.svg | 7 - .../customResources/custom-style-to-add.css | 5 - .../it-maven/customResources/logo-styles.css | 7 - integration-tests/maven/projects/it-maven/pom.xml | 192 ----------- .../main/java/it/basic/java/SampleJavaClass.java | 22 -- .../src/main/kotlin/it/basic/PublicClass.kt | 57 ---- .../src/main/kotlin/it/internal/InternalClass.kt | 7 - .../it/overriddenVisibility/VisiblePrivateClass.kt | 12 - .../src/main/kotlin/it/protected/ProtectedClass.kt | 10 - .../dokka/it/maven/BiojavaIntegrationTest.kt | 63 ---- .../dokka/it/maven/MavenIntegrationTest.kt | 219 ------------ .../jetbrains/dokka/it/AbstractIntegrationTest.kt | 168 --------- .../org/jetbrains/dokka/it/TestOutputCopier.kt | 20 -- .../org/jetbrains/dokka/it/gitSubmoduleUtils.kt | 45 --- .../kotlin/org/jetbrains/dokka/it/processUtils.kt | 55 --- 242 files changed, 9215 deletions(-) delete mode 100755 integration-tests/aws_sync.sh delete mode 100644 integration-tests/build.gradle.kts delete mode 100644 integration-tests/cli/build.gradle.kts delete mode 100644 integration-tests/cli/projects/it-cli/src/main/java/it/basic/java/SampleJavaClass.java delete mode 100644 integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/EmptyPackage.kt delete mode 100644 integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/cli/projects/it-cli/src/main/kotlin/it/internal/InternalClass.kt delete mode 100644 integration-tests/cli/projects/it-cli/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt delete mode 100644 integration-tests/cli/projects/it-cli/src/main/kotlin/it/protected/ProtectedClass.kt delete mode 100644 integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt delete mode 100644 integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/jsonBuilder.kt delete mode 100644 integration-tests/cli/src/integrationTest/resources/my-file.json delete mode 100644 integration-tests/cli/src/main/kotlin/org/jetbrains/dokka/it/cli/AbstractCliIntegrationTest.kt delete mode 100644 integration-tests/gradle/README.md delete mode 100644 integration-tests/gradle/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/coroutines/coroutines.diff delete mode 160000 integration-tests/gradle/projects/coroutines/kotlinx-coroutines delete mode 120000 integration-tests/gradle/projects/coroutines/template.root.gradle.kts delete mode 120000 integration-tests/gradle/projects/coroutines/template.settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-android-0/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-android-0/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-android-0/gradlew delete mode 100644 integration-tests/gradle/projects/it-android-0/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-android-0/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-android-0/src/main/AndroidManifest.xml delete mode 100644 integration-tests/gradle/projects/it-android-0/src/main/java/it/android/AndroidSpecificClass.kt delete mode 100644 integration-tests/gradle/projects/it-android-0/src/main/java/it/android/IntegrationTestActivity.kt delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/build.gradle delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-basic-groovy/gradlew delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/src/main/java/it/basic/java/SampleJavaClass.java delete mode 100644 integration-tests/gradle/projects/it-basic-groovy/src/main/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/gradle/projects/it-basic/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-basic/customResources/custom-resource.svg delete mode 100644 integration-tests/gradle/projects/it-basic/customResources/custom-style-to-add.css delete mode 100644 integration-tests/gradle/projects/it-basic/customResources/logo-styles.css delete mode 100644 integration-tests/gradle/projects/it-basic/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-basic/gradlew delete mode 100644 integration-tests/gradle/projects/it-basic/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-basic/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/java/it/basic/java/SampleJavaClass.java delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/kotlin/RootPackageClass.kt delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/kotlin/it/internal/InternalClass.kt delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/kotlin/it/protected/ProtectedClass.kt delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/kotlin/it/suppressedByPackage/SuppressedByPackage.kt delete mode 100644 integration-tests/gradle/projects/it-basic/src/main/kotlin/it/suppressedByPath/SuppressedByPath.kt delete mode 100644 integration-tests/gradle/projects/it-basic/src/test/kotlin/it/basic/TestClass.kt delete mode 100644 integration-tests/gradle/projects/it-collector-0/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-collector-0/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-collector-0/gradlew delete mode 100644 integration-tests/gradle/projects/it-collector-0/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-collector-0/moduleA/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/README.md delete mode 100644 integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/src/main/kotlin/org/jetbrains/dokka/it/moduleB/ModuleB.kt delete mode 100644 integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/README.md delete mode 100644 integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-collector-0/moduleA/moduleC/src/main/kotlin/org/jetbrains/dokka/it/moduleC/ModuleC.kt delete mode 100644 integration-tests/gradle/projects/it-collector-0/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-configuration/README.md delete mode 100644 integration-tests/gradle/projects/it-configuration/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-configuration/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-configuration/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-configuration/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-configuration/gradlew delete mode 100644 integration-tests/gradle/projects/it-configuration/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-configuration/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-configuration/src/main/kotlin/it/ClassWithUndocumentedDeclarations.kt delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-js-ir-0/gradlew delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/RootPackageClass.kt delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/it/internal/InternalClass.kt delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/it/suppressedByPackage/SuppressedByPackage.kt delete mode 100644 integration-tests/gradle/projects/it-js-ir-0/src/main/kotlin/it/suppressedByPath/SuppressedByPath.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-multimodule-0/gradlew delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/Module.md delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleB/src/main/kotlin/org/jetbrains/dokka/it/moduleB/ModuleB.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/Module.md delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleC/src/main/kotlin/org/jetbrains/dokka/it/moduleC/ModuleC.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/moduleA/moduleD/src/main/kotlin/org/jetbrains/dokka/it/moduleD/ModuleC.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-0/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/build.gradle delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/first/build.gradle delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstClass.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/FirstSubclass.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/foo/Main.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/first/src/main/kotlin/noPackage.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-multimodule-1/gradlew delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/gradlew.bat 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 delete mode 100644 integration-tests/gradle/projects/it-multimodule-1/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/build.gradle delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/first/build.gradle delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/first/src/main/kotlin/foo/FirstClass.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-multimodule-versioning-0/gradlew delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/second/build.gradle delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/second/src/main/kotlin/bar/SecondClass.kt delete mode 100644 integration-tests/gradle/projects/it-multimodule-versioning-0/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-multiplatform-0/gradlew delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/commonMain/kotlin/it/mpp0/CommonMainClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/commonMain/kotlin/it/mpp0/ExpectedClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/commonMain/kotlin/it/mpp0/coroutines.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/desktopMain/kotlin/it/mpp0/CPointerExtension.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/desktopMain/kotlin/it/mpp0/ExpectedClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/jsMain/kotlin/it/mpp0/ExpectedClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/jsMain/kotlin/it/mpp0/runBlocking.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/jvmMain/kotlin/it/mpp0/ExpectedClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/jvmMain/kotlin/it/mpp0/JvmOnlyClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/jvmMain/kotlin/it/mpp0/runBlocking.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/linuxMain/kotlin/it/mpp0/CPointerExtension.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/linuxMain/kotlin/it/mpp0/ExpectedClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/linuxMain/kotlin/it/mpp0/runBlocking.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/macosMain/kotlin/it/mpp0/ExpectedClass.kt delete mode 100644 integration-tests/gradle/projects/it-multiplatform-0/src/macosMain/kotlin/it/mpp0/runBlocking.kt delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradlew delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/src/main/java/it/basic/java/SampleJavaClass.java delete mode 100644 integration-tests/gradle/projects/it-sequential-tasks-execution-stress/src/main/kotlin/RootPackageClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-wasm-basic/gradlew delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/src/wasmMain/kotlin/RootPackageClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/src/wasmMain/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/src/wasmMain/kotlin/it/internal/InternalClass.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/src/wasmMain/kotlin/it/suppressedByPackage/SuppressedByPackage.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-basic/src/wasmMain/kotlin/it/suppressedByPath/SuppressedByPath.kt delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/build.gradle.kts delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradle.properties delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradle/wrapper/gradle-wrapper.jar delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradle/wrapper/gradle-wrapper.properties delete mode 100755 integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradlew delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/gradlew.bat delete mode 100644 integration-tests/gradle/projects/it-wasm-js-wasi-basic/settings.gradle.kts 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 delete mode 160000 integration-tests/gradle/projects/serialization/kotlinx-serialization delete mode 100644 integration-tests/gradle/projects/serialization/serialization.diff delete mode 120000 integration-tests/gradle/projects/serialization/template.root.gradle.kts delete mode 120000 integration-tests/gradle/projects/serialization/template.settings.gradle.kts delete mode 100644 integration-tests/gradle/projects/template.root.gradle.kts delete mode 100644 integration-tests/gradle/projects/template.settings.gradle.kts delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/StdLibDocumentationIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleCachingIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicCachingIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Collector0IntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/ConfigurationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/GradleRelocatedCachingIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/JsIRGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule0IntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/MultiModule1IntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Multiplatform0GradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/SequentialTasksExecutionStressTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Versioning0IntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/WasmGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/WasmJsWasiGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/CoroutinesGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/SerializationGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt delete mode 100644 integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/BuildVersions.kt delete mode 100644 integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestEnvironment.kt delete mode 100644 integration-tests/maven/build.gradle.kts delete mode 160000 integration-tests/maven/projects/biojava/biojava delete mode 100644 integration-tests/maven/projects/biojava/biojava.diff delete mode 100644 integration-tests/maven/projects/it-maven/customResources/custom-resource.svg delete mode 100644 integration-tests/maven/projects/it-maven/customResources/custom-style-to-add.css delete mode 100644 integration-tests/maven/projects/it-maven/customResources/logo-styles.css delete mode 100644 integration-tests/maven/projects/it-maven/pom.xml delete mode 100644 integration-tests/maven/projects/it-maven/src/main/java/it/basic/java/SampleJavaClass.java delete mode 100644 integration-tests/maven/projects/it-maven/src/main/kotlin/it/basic/PublicClass.kt delete mode 100644 integration-tests/maven/projects/it-maven/src/main/kotlin/it/internal/InternalClass.kt delete mode 100644 integration-tests/maven/projects/it-maven/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt delete mode 100644 integration-tests/maven/projects/it-maven/src/main/kotlin/it/protected/ProtectedClass.kt delete mode 100644 integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt delete mode 100644 integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/MavenIntegrationTest.kt delete mode 100644 integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt delete mode 100644 integration-tests/src/main/kotlin/org/jetbrains/dokka/it/TestOutputCopier.kt delete mode 100644 integration-tests/src/main/kotlin/org/jetbrains/dokka/it/gitSubmoduleUtils.kt delete mode 100644 integration-tests/src/main/kotlin/org/jetbrains/dokka/it/processUtils.kt (limited to 'integration-tests') diff --git a/integration-tests/aws_sync.sh b/integration-tests/aws_sync.sh deleted file mode 100755 index bee584b6..00000000 --- a/integration-tests/aws_sync.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# -# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. -# - -commits_to_store=3 - -if [ $# -lt 3 ]; then - echo "Too little arguments. Usage: ./aws_generate " - exit 1 -fi - -aws_s3_address=${1%/} # Remove trailing slash if given -project_name=$2 -project_path=$3 - -current_branch=$(git branch --show-current) -s3_project_address="${aws_s3_address}/${current_branch}/${project_name}/" -last_commits=$(git log --pretty=format:%h -n $commits_to_store) - -# List all project versions -dir=$(aws s3 ls "$s3_project_address" | awk '{print $2}') - -# Remove old versions -for d in $dir; do - for commit in "${last_commits[@]}"; do - [[ $d == "$commit/" ]] && continue - aws s3 rm --recursive "$s3_project_address$d" - done -done - -# Sync the new one -commit_hash=$(git log -1 --format="%h") - -aws s3 sync "$project_path" "$s3_project_address$commit_hash/" - -echo "$commit_hash" diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts deleted file mode 100644 index 7eb04e0f..00000000 --- a/integration-tests/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -plugins { - id("org.jetbrains.conventions.kotlin-jvm") -} - -dependencies { - // Classes from src rely on JUnit's @TempDir and Kotlin's @AfterTest, - // thus these dependencies are needed. Ideally, they should be removed. - implementation(kotlin("test-junit5")) - implementation(libs.junit.jupiterApi) - - implementation(libs.kotlinx.coroutines.core) - implementation(libs.jsoup) - implementation(libs.eclipse.jgit) -} diff --git a/integration-tests/cli/build.gradle.kts b/integration-tests/cli/build.gradle.kts deleted file mode 100644 index a5f39dfe..00000000 --- a/integration-tests/cli/build.gradle.kts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - -plugins { - id("org.jetbrains.conventions.dokka-integration-test") - id("com.github.johnrengelman.shadow") -} - -val dokka_version: String by project -evaluationDependsOn(":runners:cli") -evaluationDependsOn(":plugins:base") - -dependencies { - implementation(kotlin("test-junit5")) - implementation(projects.integrationTests) -} - -/* Create a fat base plugin jar for cli tests */ -val basePluginShadow: Configuration by configurations.creating { - attributes { - attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage::class.java, "java-runtime")) - } -} - -dependencies { - basePluginShadow(projects.plugins.base) - - // TODO [beresnev] analysis switcher - basePluginShadow(project(path = ":subprojects:analysis-kotlin-descriptors", configuration = "shadow")) -} - -val basePluginShadowJar by tasks.register("basePluginShadowJar", ShadowJar::class) { - configurations = listOf(basePluginShadow) - archiveFileName.set("fat-base-plugin-$dokka_version.jar") - archiveClassifier.set("") - - // service files are merged to make sure all Dokka plugins - // from the dependencies are loaded, and not just a single one. - mergeServiceFiles() -} - -tasks.integrationTest { - inputs.dir(file("projects")) - val cliJar = tasks.getByPath(":runners:cli:shadowJar") as ShadowJar - environment("CLI_JAR_PATH", cliJar.archiveFile.get()) - environment("BASE_PLUGIN_JAR_PATH", basePluginShadowJar.archiveFile.get()) - dependsOn(cliJar) - dependsOn(basePluginShadowJar) -} diff --git a/integration-tests/cli/projects/it-cli/src/main/java/it/basic/java/SampleJavaClass.java b/integration-tests/cli/projects/it-cli/src/main/java/it/basic/java/SampleJavaClass.java deleted file mode 100644 index 23b0202c..00000000 --- a/integration-tests/cli/projects/it-cli/src/main/java/it/basic/java/SampleJavaClass.java +++ /dev/null @@ -1,17 +0,0 @@ -package it.basic.java; - -import it.basic.PublicClass; - -/** - * This class is, unlike {@link PublicClass}, written in Java - */ -@SuppressWarnings("unused") -public class SampleJavaClass { - - /** - * @return Empty instance of {@link PublicClass} - */ - public PublicClass publicDocumentedFunction() { - return new PublicClass(); - } -} diff --git a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/EmptyPackage.kt b/integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/EmptyPackage.kt deleted file mode 100644 index 50f02c00..00000000 --- a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/EmptyPackage.kt +++ /dev/null @@ -1 +0,0 @@ -package emptypackagetest \ No newline at end of file diff --git a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/PublicClass.kt b/integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/PublicClass.kt deleted file mode 100644 index d7a72392..00000000 --- a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/PublicClass.kt +++ /dev/null @@ -1,57 +0,0 @@ -@file:Suppress("unused") - -package it.basic - -/** - * §PUBLIC§ (marker for asserts) - */ -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 function is protected and documented - */ - protected fun protectedDocumentedFunction(): String = "" - - protected fun protectedUndocumentedFunction(): 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/cli/projects/it-cli/src/main/kotlin/it/internal/InternalClass.kt b/integration-tests/cli/projects/it-cli/src/main/kotlin/it/internal/InternalClass.kt deleted file mode 100644 index f5be5406..00000000 --- a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/internal/InternalClass.kt +++ /dev/null @@ -1,7 +0,0 @@ -package it.internal - -/** - * §INTERNAL§ (marker for asserts) - * This class is internal and should not be rendered - */ -internal class InternalClass \ No newline at end of file diff --git a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt b/integration-tests/cli/projects/it-cli/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt deleted file mode 100644 index 230f5e0b..00000000 --- a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt +++ /dev/null @@ -1,12 +0,0 @@ -package it.overriddenVisibility - -/** - * Private classes and methods generally should not be visible, but [documentedVisibilities] - * are overriden for this specific package to include private code - * - * §PRIVATE§ (marker for asserts) - */ -private class VisiblePrivateClass { - private val privateVal: Int = 0 - private fun privateMethod() {} -} \ No newline at end of file diff --git a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/protected/ProtectedClass.kt b/integration-tests/cli/projects/it-cli/src/main/kotlin/it/protected/ProtectedClass.kt deleted file mode 100644 index ad19f1a1..00000000 --- a/integration-tests/cli/projects/it-cli/src/main/kotlin/it/protected/ProtectedClass.kt +++ /dev/null @@ -1,10 +0,0 @@ -package it.protected - -/** - * Protected class should be visible because it's included in documentedVisibilities - * - * §PROTECTED§ (marker for asserts) - */ -protected class ProtectedClass { - protected fun protectedFun(): String = "protected" -} diff --git a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt b/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt deleted file mode 100644 index 8bab690b..00000000 --- a/integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt +++ /dev/null @@ -1,377 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -package org.jetbrains.dokka.it.cli - -import org.jetbrains.dokka.it.awaitProcessResult -import java.io.File -import java.io.PrintWriter -import java.lang.IllegalStateException -import kotlin.test.* - -class CliIntegrationTest : AbstractCliIntegrationTest() { - - @BeforeTest - fun copyProject() { - val templateProjectDir = File("projects", "it-cli") - templateProjectDir.copyRecursively(projectDir) - } - - @Test - fun runHelp() { - val process = ProcessBuilder("java", "-jar", cliJarFile.path, "-h") - .redirectErrorStream(true) - .start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - assertTrue("Usage: " in result.output) - } - - @Test - fun runCli() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, - "-outputDir", dokkaOutputDir.path, - "-pluginsClasspath", basePluginJarFile.path, - "-moduleName", "Basic Project", - "-sourceSet", - buildString { - append(" -sourceSetName cliMain") - append(" -src ${File(projectDir, "src").path}") - append(" -jdkVersion 8") - append(" -analysisPlatform jvm") - append(" -reportUndocumented") - append(" -skipDeprecated") - } - ) - .redirectErrorStream(true) - .start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - - val extensionLoadedRegex = Regex("""Extension: org\.jetbrains\.dokka\.base\.DokkaBase""") - val amountOfExtensionsLoaded = extensionLoadedRegex.findAll(result.output).count() - - assertTrue( - amountOfExtensionsLoaded > 10, - "Expected more than 10 extensions being present (found $amountOfExtensionsLoaded)" - ) - - val undocumentedReportRegex = Regex("""Undocumented:""") - val amountOfUndocumentedReports = undocumentedReportRegex.findAll(result.output).count() - assertTrue( - amountOfUndocumentedReports > 0, - "Expected at least one report of undocumented code (found $amountOfUndocumentedReports)" - ) - - assertTrue(dokkaOutputDir.isDirectory, "Missing dokka output directory") - - val imagesDir = File(dokkaOutputDir, "images") - assertTrue(imagesDir.isDirectory, "Missing images directory") - - val scriptsDir = File(dokkaOutputDir, "scripts") - assertTrue(scriptsDir.isDirectory, "Missing scripts directory") - - val stylesDir = File(dokkaOutputDir, "styles") - assertTrue(stylesDir.isDirectory, "Missing styles directory") - - val navigationHtml = File(dokkaOutputDir, "navigation.html") - assertTrue(navigationHtml.isFile, "Missing navigation.html") - - projectDir.allHtmlFiles().forEach { file -> - assertContainsNoErrorClass(file) - assertNoUnresolvedLinks(file) - assertNoEmptyLinks(file) - assertNoEmptySpans(file) - } - - assertContentVisibility( - contentFiles = projectDir.allHtmlFiles().toList(), - documentPublic = true, - documentInternal = false, - documentProtected = false, - documentPrivate = false - ) - - assertFalse( - projectDir.resolve("output").resolve("index.html").readText().contains("emptypackagetest"), - "Expected not to render empty packages" - ) - } - - @Test - fun failCli() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, - "-outputDir", dokkaOutputDir.path, - "-pluginsClasspath", basePluginJarFile.path, - "-moduleName", "Basic Project", - "-failOnWarning", - "-sourceSet", - buildString { - append(" -sourceSetName cliMain") - append(" -src ${File(projectDir, "src").path}") - append(" -jdkVersion 8") - append(" -analysisPlatform jvm") - append(" -reportUndocumented") - } - ) - .redirectErrorStream(true) - .start() - - val result = process.awaitProcessResult() - assertEquals(1, result.exitCode, "Expected exitCode 1 (Fail)") - - assertTrue(result.output.contains("Exception in thread \"main\" org.jetbrains.dokka.DokkaException: Failed with warningCount")) - } - - @Test - fun emptyPackagesTest() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, - "-outputDir", dokkaOutputDir.path, - "-pluginsClasspath", basePluginJarFile.path, - "-moduleName", "Basic Project", - "-sourceSet", - buildString { - append(" -sourceSetName cliMain") - append(" -src ${File(projectDir, "src").path}") - append(" -jdkVersion 8") - append(" -analysisPlatform jvm") - append(" -noSkipEmptyPackages") - } - ) - .redirectErrorStream(true) - .start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - - assertTrue( - projectDir.resolve("output").resolve("index.html").readText().contains("emptypackagetest"), - "Expected to render empty packages" - ) - } - - @Test - fun `module name should be optional`() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, - "-outputDir", dokkaOutputDir.path, - "-loggingLevel", "DEBUG", - "-pluginsClasspath", basePluginJarFile.path, - "-sourceSet", - buildString { - append(" -src ${File(projectDir, "src").path}") - } - ) - .redirectErrorStream(true) - .start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - assertTrue(result.output.contains("Loaded plugins: "), "Expected output to not contain info logs") - - assertTrue(dokkaOutputDir.isDirectory, "Missing dokka output directory") - - val imagesDir = File(dokkaOutputDir, "images") - assertTrue(imagesDir.isDirectory, "Missing images directory") - - val scriptsDir = File(dokkaOutputDir, "scripts") - assertTrue(scriptsDir.isDirectory, "Missing scripts directory") - - val stylesDir = File(dokkaOutputDir, "styles") - assertTrue(stylesDir.isDirectory, "Missing styles directory") - - val navigationHtml = File(dokkaOutputDir, "navigation.html") - assertTrue(navigationHtml.isFile, "Missing navigation.html") - } - - @Test - fun `logging level should be respected`() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, - "-outputDir", dokkaOutputDir.path, - "-loggingLevel", "WARN", - "-pluginsClasspath", basePluginJarFile.path, - "-sourceSet", - buildString { - append(" -src ${File(projectDir, "src").path}") - } - ) - .redirectErrorStream(true) - .start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - assertFalse(result.output.contains("Loaded plugins: "), "Expected output to not contain info logs") - } - - @Test - fun `custom documented visibility`() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, - "-outputDir", dokkaOutputDir.path, - "-pluginsClasspath", basePluginJarFile.path, - "-moduleName", "Basic Project", - "-sourceSet", - buildString { - append(" -sourceSetName cliMain") - append(" -src ${File(projectDir, "src").path}") - append(" -jdkVersion 8") - append(" -analysisPlatform jvm") - append(" -documentedVisibilities PUBLIC;PROTECTED") - append(" -perPackageOptions it.overriddenVisibility.*,+visibility:PRIVATE") - } - ) - .redirectErrorStream(true) - .start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - - val allHtmlFiles = projectDir.allHtmlFiles().toList() - - assertContentVisibility( - contentFiles = allHtmlFiles, - documentPublic = true, - documentProtected = true, // sourceSet documentedVisibilities - documentInternal = false, - documentPrivate = true // for overriddenVisibility package - ) - - assertContainsFilePaths( - outputFiles = allHtmlFiles, - expectedFilePaths = listOf( - // documentedVisibilities is overridden for package `overriddenVisibility` specifically - // to include private code, so html pages for it are expected to have been created - Regex("it\\.overriddenVisibility/-visible-private-class/private-method\\.html"), - Regex("it\\.overriddenVisibility/-visible-private-class/private-val\\.html"), - ) - ) - } - - - @Test - fun `should accept json as input configuration`() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val resourcePath = javaClass.getResource("/my-file.json")?.toURI() ?: throw IllegalStateException("No JSON found!") - val jsonPath = File(resourcePath).absolutePath - PrintWriter(jsonPath).run { - write(jsonBuilder(dokkaOutputDir.invariantSeparatorsPath, basePluginJarFile.invariantSeparatorsPath, File(projectDir, "src").invariantSeparatorsPath, reportUndocumented = true)) - close() - } - - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, jsonPath - ).redirectErrorStream(true).start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - - val extensionLoadedRegex = Regex("""Extension: org\.jetbrains\.dokka\.base\.DokkaBase""") - val amountOfExtensionsLoaded = extensionLoadedRegex.findAll(result.output).count() - - assertTrue( - amountOfExtensionsLoaded > 10, - "Expected more than 10 extensions being present (found $amountOfExtensionsLoaded)" - ) - - val undocumentedReportRegex = Regex("""Undocumented:""") - val amountOfUndocumentedReports = undocumentedReportRegex.findAll(result.output).count() - assertTrue( - amountOfUndocumentedReports > 0, - "Expected at least one report of undocumented code (found $amountOfUndocumentedReports)" - ) - - assertTrue(dokkaOutputDir.isDirectory, "Missing dokka output directory") - } - - /** - * This test disables global `reportUndocumneted` property and set `reportUndocumented` via perPackageOptions to - * make sure that global settings apply to dokka context. - */ - @Test - fun `global settings should overwrite package options in configuration`() { - val dokkaOutputDir = File(projectDir, "output") - assertTrue(dokkaOutputDir.mkdirs()) - val resourcePath = javaClass.getResource("/my-file.json")?.toURI() ?: throw IllegalStateException("No JSON found!") - val jsonPath = File(resourcePath).absolutePath - PrintWriter(jsonPath).run { - write( - jsonBuilder( - outputPath = dokkaOutputDir.invariantSeparatorsPath, - pluginsClasspath = basePluginJarFile.invariantSeparatorsPath, - projectPath = File(projectDir, "src").invariantSeparatorsPath, - globalSourceLinks = """ - { - "localDirectory": "/home/Vadim.Mishenev/dokka/examples/cli/src/main/kotlin", - "remoteUrl": "https://github.com/Kotlin/dokka/tree/master/examples/gradle/dokka-gradle-example/src/main/kotlin", - "remoteLineSuffix": "#L" - } - """.trimIndent(), - globalExternalDocumentationLinks = """ - { - "url": "https://docs.oracle.com/javase/8/docs/api/", - "packageListUrl": "https://docs.oracle.com/javase/8/docs/api/package-list" - }, - { - "url": "https://kotlinlang.org/api/latest/jvm/stdlib/", - "packageListUrl": "https://kotlinlang.org/api/latest/jvm/stdlib/package-list" - } - """.trimIndent(), - globalPerPackageOptions = """ - { - "matchingRegex": ".*", - "skipDeprecated": "true", - "reportUndocumented": "true", - "documentedVisibilities": ["PUBLIC", "PRIVATE", "PROTECTED", "INTERNAL", "PACKAGE"] - } - """.trimIndent(), - reportUndocumented = false - ), - ) - close() - } - - val process = ProcessBuilder( - "java", "-jar", cliJarFile.path, jsonPath - ).redirectErrorStream(true).start() - - val result = process.awaitProcessResult() - assertEquals(0, result.exitCode, "Expected exitCode 0 (Success)") - - val extensionLoadedRegex = Regex("""Extension: org\.jetbrains\.dokka\.base\.DokkaBase""") - val amountOfExtensionsLoaded = extensionLoadedRegex.findAll(result.output).count() - - assertTrue( - amountOfExtensionsLoaded > 10, - "Expected more than 10 extensions being present (found $amountOfExtensionsLoaded)" - ) - - val undocumentedReportRegex = Regex("""Undocumented:""") - val amountOf