aboutsummaryrefslogtreecommitdiff
path: root/dokka-integration-tests/gradle/projects/coroutines/coroutines.diff
diff options
context:
space:
mode:
authorIgnat Beresnev <ignat.beresnev@jetbrains.com>2023-11-10 11:46:54 +0100
committerGitHub <noreply@github.com>2023-11-10 11:46:54 +0100
commit8e5c63d035ef44a269b8c43430f43f5c8eebfb63 (patch)
tree1b915207b2b9f61951ddbf0ff2e687efd053d555 /dokka-integration-tests/gradle/projects/coroutines/coroutines.diff
parenta44efd4ba0c2e4ab921ff75e0f53fc9335aa79db (diff)
downloaddokka-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>
Diffstat (limited to 'dokka-integration-tests/gradle/projects/coroutines/coroutines.diff')
-rw-r--r--dokka-integration-tests/gradle/projects/coroutines/coroutines.diff96
1 files changed, 96 insertions, 0 deletions
diff --git a/dokka-integration-tests/gradle/projects/coroutines/coroutines.diff b/dokka-integration-tests/gradle/projects/coroutines/coroutines.diff
new file mode 100644
index 00000000..6fcf896c
--- /dev/null
+++ b/dokka-integration-tests/gradle/projects/coroutines/coroutines.diff
@@ -0,0 +1,96 @@
+diff --git a/build.gradle b/build.gradle
+index e7d405e12..236310823 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -59,8 +59,9 @@ buildscript {
+ }
+
+ dependencies {
++ def dokkaVersion = System.getenv('DOKKA_VERSION')
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+- classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
++ classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
+ classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version"
+ classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version"
+ classpath "com.github.node-gradle:gradle-node-plugin:$gradle_node_version"
+@@ -107,6 +108,9 @@ allprojects {
+ mavenLocal()
+ }
+ }
++ repositories {
++ mavenLocal()
++ }
+
+ ext.unpublished = unpublished
+
+@@ -142,6 +146,7 @@ allprojects {
+ google()
+ mavenCentral()
+ CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project)
++ mavenLocal()
+ }
+ }
+
+diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
+index ae54ad0f6..786cff366 100644
+--- a/buildSrc/build.gradle.kts
++++ b/buildSrc/build.gradle.kts
+@@ -25,6 +25,7 @@ repositories {
+ if (buildSnapshotTrain) {
+ mavenLocal()
+ }
++ mavenLocal()
+ }
+
+ val gradleProperties = Properties().apply {
+@@ -49,12 +50,12 @@ dependencies {
+ * our version of Gradle bundles Kotlin 1.4.x and can read metadata only up to 1.5.x,
+ * thus we're excluding stdlib compiled with 1.6.0 from dependencies.
+ */
+- implementation("org.jetbrains.dokka:dokka-gradle-plugin:${version("dokka")}") {
++ implementation("org.jetbrains.dokka:dokka-gradle-plugin:${System.getenv("DOKKA_VERSION")}") {
+ exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
+ exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk7")
+ exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
+ }
+- implementation("org.jetbrains.dokka:dokka-core:${version("dokka")}") {
++ implementation("org.jetbrains.dokka:dokka-core:${System.getenv("DOKKA_VERSION")}") {
+ exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
+ exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk7")
+ exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
+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..9af01ef86 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=non-existing-sanity-check-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()
+ }
+ }
+