rollback gradle integration tests to use mavenLocal for now

Kotlin · Oct 23, 2023 · 0dad2cd · 0dad2cd
1 parent b8b944e
commit 0dad2cd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/dokka-integration-tests/gradle/build.gradle.kts b/dokka-integration-tests/gradle/build.gradle.kts
@@ -24,21 +24,10 @@ val gradlePluginClassic = gradle.includedBuild("gradle-plugin-classic")
 
 tasks.integrationTest {
     dependsOn(
-        dokkaSubprojects.task(":publishAllPublicationsToProjectLocalRepository"),
-        gradlePluginClassic.task(":publishAllPublicationsToProjectLocalRepository"),
-    )
-    environment(
-        "DOKKA_VERSION",
-        project.version
-    )
-    environment(
-        "DOKKA_LOCAL_REPOSITORY_SUBPROJECTS",
-        dokkaSubprojects.projectDir.resolve("build/maven-project-local")
-    )
-    environment(
-        "DOKKA_LOCAL_REPOSITORY_GRADLE_PLUGIN",
-        gradlePluginClassic.projectDir.resolve("build/maven-project-local")
+        dokkaSubprojects.task(":publishToMavenLocal"),
+        gradlePluginClassic.task(":publishToMavenLocal"),
     )
+    environment("DOKKA_VERSION", project.version)
     inputs.dir(file("projects"))
 
     javaLauncher.set(javaToolchains.launcherFor {

diff --git a/dokka-integration-tests/gradle/projects/coroutines/coroutines.diff b/dokka-integration-tests/gradle/projects/coroutines/coroutines.diff
@@ -52,7 +52,7 @@ index 3d9431be0..b60114bc2 100644
  html_version=0.7.2
  lincheck_version=2.18.1
 -dokka_version=1.8.10
-+dokka_version=for-integration-tests-SNAPSHOT
++dokka_version=1.9.20-SNAPSHOT
  byte_buddy_version=1.10.9
  reactor_version=3.4.1
  reactive_streams_version=1.0.3

diff --git a/dokka-integration-tests/gradle/projects/serialization/serialization.diff b/dokka-integration-tests/gradle/projects/serialization/serialization.diff
@@ -7,7 +7,7 @@ index 5ef66cd9..51a90924 100644
  junit_version=4.12
  jackson_version=2.10.0.pr1
 -dokka_version=1.8.10
-+dokka_version=for-integration-tests-SNAPSHOT
++dokka_version=1.9.20-SNAPSHOT
  native.deploy=
  validator_version=0.13.2
  knit_version=0.5.0-Beta
diff --git a/dokka-integration-tests/gradle/projects/template.root.gradle.kts b/dokka-integration-tests/gradle/projects/template.root.gradle.kts
@@ -4,7 +4,7 @@
 
 allprojects {
     repositories {
-        maven(System.getenv("DOKKA_LOCAL_REPOSITORY_SUBPROJECTS")) {
+        mavenLocal {
             content {
                 includeGroup("org.jetbrains.dokka")
             }

diff --git a/dokka-integration-tests/gradle/projects/template.settings.gradle.kts b/dokka-integration-tests/gradle/projects/template.settings.gradle.kts
@@ -31,12 +31,12 @@ pluginManagement {
         }
     }
     repositories {
-        maven(System.getenv("DOKKA_LOCAL_REPOSITORY_GRADLE_PLUGIN")) {
+        mavenLocal {
             content {
                 includeGroup("org.jetbrains.dokka")
             }
         }
-        maven(System.getenv("DOKKA_LOCAL_REPOSITORY_SUBPROJECTS")) {
+        mavenLocal {
             content {
                 includeGroup("org.jetbrains.dokka")
             }