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/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 -- 211 files changed, 7573 deletions(-) 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 (limited to 'integration-tests/gradle') diff --git a/integration-tests/gradle/README.md b/integration-tests/gradle/README.md deleted file mode 100644 index 706cfb61..00000000 --- a/integration-tests/gradle/README.md +++ /dev/null @@ -1,21 +0,0 @@ -### Note -All Gradle projects inside the `project` subfolder can -also be imported to the IDE by clicking on the corresponding -build.gradle.kts file -> "import gradle project". - -Before importing: Make sure that you have dokka installed -locally (`./gradlew publishToMavenLocal`). - -### To update git submodules - -Integration tests have fixed git revision number, with the diff patch applied from the corresponding file (e.g. [`coroutines.diff`](projects/coroutines/coroutines.diff)). - -In order to update: - -* Checkout the project with the requered revision - - It's some state of the `master` -* Manually write the diff (or apply the existing one and tweak) to have the project buildable against locally published Dokka of version `for-integration-tests-SNAPSHOT` -* `git diff > $pathToProjectInDokka/project.diff` -* Go to `$pathToProjectInDokka`, `git fetch && git checkout $revisionNumber` - - Prior to that, ensure that you have your git submodules initialized -* Ensure that the corresponding `GradleIntegrationTest` passes locally and push diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts deleted file mode 100644 index 3aa26b9b..00000000 --- a/integration-tests/gradle/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -import org.jetbrains.dependsOnMavenLocalPublication - -plugins { - id("org.jetbrains.conventions.dokka-integration-test") -} - -dependencies { - implementation(projects.integrationTests) - - implementation(kotlin("test-junit5")) - implementation(libs.junit.jupiterApi) - implementation(libs.junit.jupiterParams) - - implementation(gradleTestKit()) - - implementation(libs.jsoup) -} - -tasks.integrationTest { - val dokka_version: String by project - environment("DOKKA_VERSION", dokka_version) - inputs.dir(file("projects")) - dependsOnMavenLocalPublication() - - javaLauncher.set(javaToolchains.launcherFor { - // kotlinx.coroutines requires Java 11+ - languageVersion.set(dokkaBuild.testJavaLauncherVersion.map { - maxOf(it, JavaLanguageVersion.of(11)) - }) - }) -} diff --git a/integration-tests/gradle/projects/coroutines/coroutines.diff b/integration-tests/gradle/projects/coroutines/coroutines.diff deleted file mode 100644 index d2216f1b..00000000 --- a/integration-tests/gradle/projects/coroutines/coroutines.diff +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index e7d405e12..0ca2169fe 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -107,6 +107,9 @@ allprojects { - mavenLocal() - } - } -+ repositories { -+ mavenLocal() -+ } - - ext.unpublished = unpublished - -@@ -142,6 +145,7 @@ allprojects { - google() - mavenCentral() - CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project) -+ mavenLocal() - } - } - -diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts -index ae54ad0f6..4655940a9 100644 ---- a/buildSrc/build.gradle.kts -+++ b/buildSrc/build.gradle.kts -@@ -25,6 +25,7 @@ repositories { - if (buildSnapshotTrain) { - mavenLocal() - } -+ mavenLocal() - } - - val gradleProperties = Properties().apply { -diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts -index c2e859f65..43dc4f749 100644 ---- a/buildSrc/settings.gradle.kts -+++ b/buildSrc/settings.gradle.kts -@@ -14,5 +14,6 @@ pluginManagement { - if (build_snapshot_train?.toBoolean() == true) { - mavenLocal() - } -+ mavenLocal() - } - } -diff --git a/gradle.properties b/gradle.properties -index 3d9431be0..b60114bc2 100644 ---- a/gradle.properties -+++ b/gradle.properties -@@ -14,7 +14,7 @@ atomicfu_version=0.21.0 - knit_version=0.5.0-Beta - html_version=0.7.2 - lincheck_version=2.18.1 --dokka_version=1.8.10 -+dokka_version=for-integration-tests-SNAPSHOT - byte_buddy_version=1.10.9 - reactor_version=3.4.1 - reactive_streams_version=1.0.3 -diff --git a/settings.gradle b/settings.gradle -index 151c087fd..e578bdb93 100644 ---- a/settings.gradle -+++ b/settings.gradle -@@ -11,6 +11,7 @@ pluginManagement { - repositories { - maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" } - gradlePluginPortal() -+ mavenLocal() - } - } - diff --git a/integration-tests/gradle/projects/coroutines/kotlinx-coroutines b/integration-tests/gradle/projects/coroutines/kotlinx-coroutines deleted file mode 160000 index b78bbf51..00000000 --- a/integration-tests/gradle/projects/coroutines/kotlinx-coroutines +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b78bbf518bd8e90e9ed2133ebdacc36441210cd6 diff --git a/integration-tests/gradle/projects/coroutines/template.root.gradle.kts b/integration-tests/gradle/projects/coroutines/template.root.gradle.kts deleted file mode 120000 index 895ca83d..00000000 --- a/integration-tests/gradle/projects/coroutines/template.root.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -../template.root.gradle.kts \ No newline at end of file diff --git a/integration-tests/gradle/projects/coroutines/template.settings.gradle.kts b/integration-tests/gradle/projects/coroutines/template.settings.gradle.kts deleted file mode 120000 index 7b43b3e7..00000000 --- a/integration-tests/gradle/projects/coroutines/template.settings.gradle.kts +++ /dev/null @@ -1 +0,0 @@ -../template.settings.gradle.kts \ No newline at end of file diff --git a/integration-tests/gradle/projects/it-android-0/build.gradle.kts b/integration-tests/gradle/projects/it-android-0/build.gradle.kts deleted file mode 100644 index d9d9e6be..00000000 --- a/integration-tests/gradle/projects/it-android-0/build.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -plugins { - id("com.android.library") - id("org.jetbrains.dokka") - kotlin("android") -} - -apply(from = "../template.root.gradle.kts") - -android { - defaultConfig { - minSdkVersion(21) - setCompileSdkVersion(29) - } -} - -dependencies { - implementation("androidx.appcompat:appcompat:1.1.0") -} diff --git a/integration-tests/gradle/projects/it-android-0/gradle.properties b/integration-tests/gradle/projects/it-android-0/gradle.properties deleted file mode 100644 index 286fe3c3..00000000 --- a/integration-tests/gradle/projects/it-android-0/gradle.properties +++ /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. -# - -dokka_it_kotlin_version=1.9.20 -dokka_it_android_gradle_plugin_version=4.2.2 -android.useAndroidX=true diff --git a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.jar b/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1c..00000000 Binary files a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a434026d..00000000 --- a/integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. -# - -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-android-0/gradlew b/integration-tests/gradle/projects/it-android-0/gradlew deleted file mode 100755 index 2fe81a7d..00000000 --- a/integration-tests/gradle/projects/it-android-0/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/integration-tests/gradle/projects/it-android-0/gradlew.bat b/integration-tests/gradle/projects/it-android-0/gradlew.bat deleted file mode 100644 index 24467a14..00000000 --- a/integration-tests/gradle/projects/it-android-0/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/integration-tests/gradle/projects/it-android-0/settings.gradle.kts b/integration-tests/gradle/projects/it-android-0/settings.gradle.kts deleted file mode 100644 index a429a7b7..00000000 --- a/integration-tests/gradle/projects/it-android-0/settings.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. - */ - -@file:Suppress("LocalVariableName", "UnstableApiUsage") - -apply(from = "../template.settings.gradle.kts") -rootProject.name = "it-android-0" - diff --git a/integration-tests/gradle/projects/it-android-0/src/main/AndroidManifest.xml b/integration-tests/gradle/projects/it-android-0/src/main/AndroidManifest.xml deleted file mode 100644 index 43894029..00000000 --- a/integration-tests/gradle/projects/it-android-0/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/integration-tests/gradle/projects/it-android-0/src/main/java/it/android/AndroidSpecificClass.kt b/integration-tests/gradle/projects/it-android-0/src/main/java/it/android/AndroidSpecificClass.kt deleted file mode 100644 index cb9046b1..00000000 --- a/integration-tests/gradle/projects/it-android-0/src/main/java/it/android/AndroidSpecificClass.kt +++ /dev/null @@ -1,16 +0,0 @@ -@file:Suppress("unused") - -package it.android - -import android.content.Context -import android.util.SparseIntArray -import android.view.View - -/** - * This class is specific to android and uses android classes like: - * [Context], [SparseIntArray] or [View] - */ -class AndroidSpecificClass { - fun sparseIntArray() = SparseIntArray() - fun createView(context: Context): View = View(context) -} diff --git a/integration-tests/gradle/projects/it-android-0/src/main/java/it/android/IntegrationTestActivity.kt b/integration-tests/gradle/projects/it-android-0/src/main/java/it/android/IntegrationTestActivity.kt deleted file mode 100644 index 1792818b..00000000 --- a/integration-tests/gradle/projects/it-android-0/src/main/java/it/android/IntegrationTestActivity.kt +++ /dev/null @@ -1,22 +0,0 @@ -package it.android - -import android.annotation.SuppressLint -import android.os.Bundle -import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity - -/** - * Some Activity implementing [AppCompatActivity] from android x - */ -class IntegrationTestActivity : AppCompatActivity() { - /** - * Will show a small happy text - */ - @SuppressLint("SetTextI18n") - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - val textView = TextView(this) - textView.text = "I am so happy :)" - setContentView(textView) - } -} \ No newline at end of file diff --git a/integration-tests/gradle/projects/it-basic-groovy/build.gradle b/integration-tests/gradle/projects/it-basic-groovy/build.gradle deleted file mode 100644 index f368ed10..00000000 --- a/integration-tests/gradle/projects/it-basic-groovy/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' - id("org.jetbrains.dokka") -} - -apply from: '../template.root.gradle.kts' - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib" -} - -dokkaHtml { - outputDirectory = new File(buildDir, "/dokka/customHtml") - failOnWarning = false - dokkaSourceSets { - customSourceSet { - sourceRoot(file("src/main/java")) - sourceRoot(file("src/main/kotlin")) - displayName.set("custom") - reportUndocumented.set(true) - } - - configureEach { - perPackageOption { // testing closures - matchingRegex.set(".*internal.*") - suppress.set(true) - } - - sourceLink { // testing closures - localDirectory.set(file("src/main")) - remoteUrl.set( - new URL( - "https://github.com/Kotlin/dokka/tree/master/" + - "integration-tests/gradle/projects/it-basic-groovy/src/main" - ) - ) - } - } - } - -} - -dokkaJavadoc { - outputDirectory = new File(buildDir, "dokka/customJavadoc") -} - -dokkaGfm { - outputDirectory = new File(buildDir, "dokka/customGfm") -} - -dokkaJekyll { - outputDirectory = new File(buildDir, "dokka/customJekyll") -} - diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties deleted file mode 100644 index 5904fc21..00000000 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. -# - -dokka_it_kotlin_version=1.9.20 diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.jar b/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 62d4c053..00000000 Binary files a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a434026d..00000000 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. -# - -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradlew b/integration-tests/gradle/projects/it-basic-groovy/gradlew deleted file mode 100755 index fbd7c515..00000000 --- a/integration-tests/gradle/projects/it-basic-groovy/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3