diff options
| author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2023-11-10 11:46:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-10 11:46:54 +0100 |
| commit | 8e5c63d035ef44a269b8c43430f43f5c8eebfb63 (patch) | |
| tree | 1b915207b2b9f61951ddbf0ff2e687efd053d555 | |
| parent | a44efd4ba0c2e4ab921ff75e0f53fc9335aa79db (diff) | |
| download | dokka-8e5c63d035ef44a269b8c43430f43f5c8eebfb63.tar.gz dokka-8e5c63d035ef44a269b8c43430f43f5c8eebfb63.tar.bz2 dokka-8e5c63d035ef44a269b8c43430f43f5c8eebfb63.zip | |
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 <whyoleg@gmail.com>
| -rw-r--r-- | .github/workflows/preview-publish-ga.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/preview-publish-web-s3.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/tests-smoke.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/tests-thorough.yml | 5 | ||||
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | build-logic/README.md | 21 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.base.gradle.kts (renamed from build-logic/src/main/kotlin/org/jetbrains/conventions/base.gradle.kts) | 11 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.gradle-plugin.gradle.kts | 35 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.java.gradle.kts (renamed from build-logic/src/main/kotlin/org/jetbrains/conventions/base-java.gradle.kts) | 14 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.kotlin-jvm.gradle.kts | 36 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.publish-base.gradle.kts | 95 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.publish-gradle-plugin.gradle.kts | 36 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.publish-jvm.gradle.kts | 19 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.publish-shadow.gradle.kts | 31 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.setup-html-frontend-files.gradle.kts (renamed from build-logic/src/main/kotlin/org/jetbrains/conventions/dokka-html-frontend-files.gradle.kts) | 4 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.setup-maven-cli.gradle.kts (renamed from build-logic/src/main/kotlin/org/jetbrains/conventions/maven-cli-setup.gradle.kts) | 4 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.test-integration.gradle.kts (renamed from build-logic/src/main/kotlin/org/jetbrains/conventions/dokka-integration-test.gradle.kts) | 9 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild.test-k2.gradle.kts (renamed from build-logic/src/main/kotlin/org/jetbrains/conventions/base-unit-test.gradle.kts) | 8 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild/DokkaBuildProperties.kt (renamed from build-logic/src/main/kotlin/org/jetbrains/DokkaBuildProperties.kt) | 2 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild/PublicationUtils.kt | 27 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/dokkabuild/internal/GradleKotlinDslAccessors.kt (renamed from build-logic/src/main/kotlin/org/jetbrains/internal/gradleKotlinDslAccessors.kt) | 2 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt | 66 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/DokkaVersion.kt | 23 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/DokkaVersionType.kt | 12 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/ValidatePublications.kt | 49 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/conventions/dokka.gradle.kts | 17 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/conventions/gradle-plugin.gradle.kts | 13 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/conventions/kotlin-jvm.gradle.kts | 58 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/conventions/maven-publish.gradle.kts | 72 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/projectUtils.kt | 20 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/publication.kt | 125 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/taskUtils.kt | 26 | ||||
| -rw-r--r-- | build.gradle.kts | 98 | ||||
| -rw-r--r-- | core/test-api/build.gradle.kts | 20 | ||||
| -rw-r--r-- | docs-developer/build.gradle.kts | 5 | ||||
| -rw-r--r-- | docs-developer/src/doc/docs/developer_guide/architecture/extension_points/core_extension_points.md | 2 | ||||
| -rwxr-xr-x | dokka-integration-tests/aws_sync.sh (renamed from integration-tests/aws_sync.sh) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/build.gradle.kts | 34 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/build.gradle.kts (renamed from integration-tests/cli/build.gradle.kts) | 38 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/projects/it-cli/src/main/java/it/basic/java/SampleJavaClass.java (renamed from integration-tests/cli/projects/it-cli/src/main/java/it/basic/java/SampleJavaClass.java) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/EmptyPackage.kt (renamed from integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/EmptyPackage.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/PublicClass.kt (renamed from integration-tests/cli/projects/it-cli/src/main/kotlin/it/basic/PublicClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/projects/it-cli/src/main/kotlin/it/internal/InternalClass.kt (renamed from integration-tests/cli/projects/it-cli/src/main/kotlin/it/internal/InternalClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/projects/it-cli/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt (renamed from integration-tests/cli/projects/it-cli/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/projects/it-cli/src/main/kotlin/it/protected/ProtectedClass.kt (renamed from integration-tests/cli/projects/it-cli/src/main/kotlin/it/protected/ProtectedClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt (renamed from integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/CliIntegrationTest.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/jsonBuilder.kt (renamed from integration-tests/cli/src/integrationTest/kotlin/org/jetbrains/dokka/it/cli/jsonBuilder.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/src/integrationTest/resources/my-file.json (renamed from integration-tests/cli/src/integrationTest/resources/my-file.json) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/cli/src/main/kotlin/org/jetbrains/dokka/it/cli/AbstractCliIntegrationTest.kt (renamed from integration-tests/cli/src/main/kotlin/org/jetbrains/dokka/it/cli/AbstractCliIntegrationTest.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle.properties | 12 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/README.md (renamed from integration-tests/gradle/README.md) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/build.gradle.kts (renamed from integration-tests/gradle/build.gradle.kts) | 14 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/coroutines/coroutines.diff | 96 | ||||
| m--------- | dokka-integration-tests/gradle/projects/coroutines/kotlinx-coroutines (renamed from integration-tests/gradle/projects/coroutines/kotlinx-coroutines) | 0 | ||||
| l--------- | dokka-integration-tests/gradle/projects/coroutines/template.root.gradle.kts (renamed from integration-tests/gradle/projects/coroutines/template.root.gradle.kts) | 0 | ||||
| l--------- | dokka-integration-tests/gradle/projects/coroutines/template.settings.gradle.kts (renamed from integration-tests/gradle/projects/coroutines/template.settings.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/build.gradle.kts (renamed from integration-tests/gradle/projects/it-android-0/build.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/gradle.properties (renamed from integration-tests/gradle/projects/it-android-0/gradle.properties) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.jar (renamed from integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.jar) | bin | 58695 -> 58695 bytes | |||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties (renamed from integration-tests/gradle/projects/it-android-0/gradle/wrapper/gradle-wrapper.properties) | 0 | ||||
| -rwxr-xr-x | dokka-integration-tests/gradle/projects/it-android-0/gradlew (renamed from integration-tests/gradle/projects/it-android-0/gradlew) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/gradlew.bat (renamed from integration-tests/gradle/projects/it-android-0/gradlew.bat) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/settings.gradle.kts (renamed from integration-tests/gradle/projects/it-android-0/settings.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/src/main/AndroidManifest.xml (renamed from integration-tests/gradle/projects/it-android-0/src/main/AndroidManifest.xml) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/src/main/java/it/android/AndroidSpecificClass.kt (renamed from integration-tests/gradle/projects/it-android-0/src/main/java/it/android/AndroidSpecificClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-android-0/src/main/java/it/android/IntegrationTestActivity.kt (renamed from integration-tests/gradle/projects/it-android-0/src/main/java/it/android/IntegrationTestActivity.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/build.gradle (renamed from integration-tests/gradle/projects/it-basic-groovy/build.gradle) | 2 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/gradle.properties (renamed from integration-tests/gradle/projects/it-basic-groovy/gradle.properties) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.jar (renamed from integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.jar) | bin | 58910 -> 58910 bytes | |||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties (renamed from integration-tests/gradle/projects/it-basic-groovy/gradle/wrapper/gradle-wrapper.properties) | 0 | ||||
| -rwxr-xr-x | dokka-integration-tests/gradle/projects/it-basic-groovy/gradlew (renamed from integration-tests/gradle/projects/it-basic-groovy/gradlew) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/gradlew.bat (renamed from integration-tests/gradle/projects/it-basic-groovy/gradlew.bat) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/settings.gradle.kts (renamed from integration-tests/gradle/projects/it-basic-groovy/settings.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/src/main/java/it/basic/java/SampleJavaClass.java (renamed from integration-tests/gradle/projects/it-basic-groovy/src/main/java/it/basic/java/SampleJavaClass.java) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic-groovy/src/main/kotlin/it/basic/PublicClass.kt (renamed from integration-tests/gradle/projects/it-basic-groovy/src/main/kotlin/it/basic/PublicClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/build.gradle.kts (renamed from integration-tests/gradle/projects/it-basic/build.gradle.kts) | 2 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/customResources/custom-resource.svg (renamed from integration-tests/gradle/projects/it-basic/customResources/custom-resource.svg) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/customResources/custom-style-to-add.css (renamed from integration-tests/gradle/projects/it-basic/customResources/custom-style-to-add.css) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/customResources/logo-styles.css (renamed from integration-tests/gradle/projects/it-basic/customResources/logo-styles.css) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/gradle.properties (renamed from integration-tests/gradle/projects/it-basic/gradle.properties) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.jar (renamed from integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.jar) | bin | 58910 -> 58910 bytes | |||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties (renamed from integration-tests/gradle/projects/it-basic/gradle/wrapper/gradle-wrapper.properties) | 0 | ||||
| -rwxr-xr-x | dokka-integration-tests/gradle/projects/it-basic/gradlew (renamed from integration-tests/gradle/projects/it-basic/gradlew) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/gradlew.bat (renamed from integration-tests/gradle/projects/it-basic/gradlew.bat) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/settings.gradle.kts (renamed from integration-tests/gradle/projects/it-basic/settings.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/java/it/basic/java/SampleJavaClass.java (renamed from integration-tests/gradle/projects/it-basic/src/main/java/it/basic/java/SampleJavaClass.java) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/kotlin/RootPackageClass.kt (renamed from integration-tests/gradle/projects/it-basic/src/main/kotlin/RootPackageClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/kotlin/it/basic/PublicClass.kt (renamed from integration-tests/gradle/projects/it-basic/src/main/kotlin/it/basic/PublicClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/kotlin/it/internal/InternalClass.kt (renamed from integration-tests/gradle/projects/it-basic/src/main/kotlin/it/internal/InternalClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt (renamed from integration-tests/gradle/projects/it-basic/src/main/kotlin/it/overriddenVisibility/VisiblePrivateClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/kotlin/it/protected/ProtectedClass.kt (renamed from integration-tests/gradle/projects/it-basic/src/main/kotlin/it/protected/ProtectedClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/kotlin/it/suppressedByPackage/SuppressedByPackage.kt (renamed from integration-tests/gradle/projects/it-basic/src/main/kotlin/it/suppressedByPackage/SuppressedByPackage.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/main/kotlin/it/suppressedByPath/SuppressedByPath.kt (renamed from integration-tests/gradle/projects/it-basic/src/main/kotlin/it/suppressedByPath/SuppressedByPath.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-basic/src/test/kotlin/it/basic/TestClass.kt (renamed from integration-tests/gradle/projects/it-basic/src/test/kotlin/it/basic/TestClass.kt) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/build.gradle.kts (renamed from integration-tests/gradle/projects/it-collector-0/build.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/gradle.properties (renamed from integration-tests/gradle/projects/it-collector-0/gradle.properties) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.jar (renamed from integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.jar) | bin | 58695 -> 58695 bytes | |||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties (renamed from integration-tests/gradle/projects/it-collector-0/gradle/wrapper/gradle-wrapper.properties) | 0 | ||||
| -rwxr-xr-x | dokka-integration-tests/gradle/projects/it-collector-0/gradlew (renamed from integration-tests/gradle/projects/it-collector-0/gradlew) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/gradlew.bat (renamed from integration-tests/gradle/projects/it-collector-0/gradlew.bat) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/moduleA/build.gradle.kts (renamed from integration-tests/gradle/projects/it-collector-0/moduleA/build.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/README.md (renamed from integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/README.md) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts (renamed from integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/build.gradle.kts) | 0 | ||||
| -rw-r--r-- | dokka-integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/src/main/kotlin/org/jetbrains/dokka/it/moduleB/ModuleB.kt (renamed from integration-tests/gradle/projects/it-collector-0/moduleA/moduleB/src/main/kotlin/org/jetbrains/dokka/it/moduleB/ModuleB.kt) | 0 | ||||
| -rw-r--r-- |
