From 2f70e00b691a1463eee5b1b7042cba5c7f42e021 Mon Sep 17 00:00:00 2001
From: Chris Ryan <74329397+chris-ryan-square@users.noreply.github.com>
Date: Tue, 20 Jul 2021 11:01:36 +1000
Subject: [PATCH] WIP: Kotlin 1.5 with necessary dokka upgrade
 (cashapp/misk#2055)

* Upgrade mvn publish pluging; fix dokka setup for change

* Attempt to get dokkaGfm to work properly - OOM/Metaspace problem, see: https://github.com/Kotlin/dokka/issues/1405

* Upgrade to Kotlin 1.5

* Upgrade to kotlin 1.5; fix misk-admin config; use --no-daemon --> still OOM/Metaspace :(

* Do Dokka tasks in separate daemons and separate modules; reduce memeory required

* Remove non-existent dir call

* Only do the publish docs when building master
---
 wisp/wisp-aws-environment/build.gradle.kts                | 7 -------
 wisp/wisp-client/build.gradle.kts                         | 7 -------
 wisp/wisp-config/build.gradle.kts                         | 7 -------
 .../src/test/kotlin/wisp/config/WispConfigTest.kt         | 8 ++++----
 wisp/wisp-containers-testing/build.gradle.kts             | 7 -------
 wisp/wisp-deployment-testing/build.gradle.kts             | 7 -------
 wisp/wisp-deployment/build.gradle.kts                     | 7 -------
 wisp/wisp-feature-testing/build.gradle.kts                | 7 -------
 wisp/wisp-feature/build.gradle.kts                        | 7 -------
 wisp/wisp-logging-testing/build.gradle.kts                | 7 -------
 wisp/wisp-logging/build.gradle.kts                        | 7 -------
 wisp/wisp-resource-loader-testing/build.gradle.kts        | 7 -------
 wisp/wisp-resource-loader/build.gradle.kts                | 7 -------
 wisp/wisp-ssl/build.gradle.kts                            | 7 -------
 14 files changed, 4 insertions(+), 95 deletions(-)

diff --git a/wisp/wisp-aws-environment/build.gradle.kts b/wisp/wisp-aws-environment/build.gradle.kts
index db9d5a093d9..769d2c9842a 100644
--- a/wisp/wisp-aws-environment/build.gradle.kts
+++ b/wisp/wisp-aws-environment/build.gradle.kts
@@ -9,11 +9,4 @@ dependencies {
 
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-client/build.gradle.kts b/wisp/wisp-client/build.gradle.kts
index c1a5ccc2d89..89511036828 100644
--- a/wisp/wisp-client/build.gradle.kts
+++ b/wisp/wisp-client/build.gradle.kts
@@ -20,11 +20,4 @@ dependencies {
   implementation(Dependencies.retrofitWire)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-config/build.gradle.kts b/wisp/wisp-config/build.gradle.kts
index d5d42461a05..1ce4bcae0d8 100644
--- a/wisp/wisp-config/build.gradle.kts
+++ b/wisp/wisp-config/build.gradle.kts
@@ -11,11 +11,4 @@ dependencies {
   testImplementation(Dependencies.kotlinTest)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-config/src/test/kotlin/wisp/config/WispConfigTest.kt b/wisp/wisp-config/src/test/kotlin/wisp/config/WispConfigTest.kt
index 09b051cc24a..29ece0ae67a 100644
--- a/wisp/wisp-config/src/test/kotlin/wisp/config/WispConfigTest.kt
+++ b/wisp/wisp-config/src/test/kotlin/wisp/config/WispConfigTest.kt
@@ -107,8 +107,8 @@ internal class WispConfigTest {
     assertEquals("RRRRRRRRRRRRRRRRR", myConfig.aws.AWS_SECRET_ACCESS_KEY.value)
 
     // values should me masked
-    assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.aws.AWS_ACCESS_KEY_ID)
-    assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.aws.AWS_SECRET_ACCESS_KEY)
+    assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.aws.AWS_ACCESS_KEY_ID.toString())
+    assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.aws.AWS_SECRET_ACCESS_KEY.toString())
   }
 
   @Test
@@ -125,8 +125,8 @@ internal class WispConfigTest {
     assertEquals("RRRRRRRRRRRRRRRRR", myConfig.AWS_SECRET_ACCESS_KEY.value)
 
     // values should me masked
-    assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.AWS_ACCESS_KEY_ID)
-    assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.AWS_SECRET_ACCESS_KEY)
+    assertNotEquals("AAAAAAAAAAAAAAAA", myConfig.AWS_ACCESS_KEY_ID.toString())
+    assertNotEquals("RRRRRRRRRRRRRRRRR", myConfig.AWS_SECRET_ACCESS_KEY.toString())
   }
 
   // TODO(chrisryan): add tests to support other formats
diff --git a/wisp/wisp-containers-testing/build.gradle.kts b/wisp/wisp-containers-testing/build.gradle.kts
index 04e6c52b5d1..049566f10b8 100644
--- a/wisp/wisp-containers-testing/build.gradle.kts
+++ b/wisp/wisp-containers-testing/build.gradle.kts
@@ -13,11 +13,4 @@ dependencies {
   api(project(":wisp-logging"))
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-deployment-testing/build.gradle.kts b/wisp/wisp-deployment-testing/build.gradle.kts
index 3a810e21e66..1ba068a2033 100644
--- a/wisp/wisp-deployment-testing/build.gradle.kts
+++ b/wisp/wisp-deployment-testing/build.gradle.kts
@@ -6,11 +6,4 @@ dependencies {
   testImplementation(Dependencies.kotlinTest)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-deployment/build.gradle.kts b/wisp/wisp-deployment/build.gradle.kts
index 8892efe7e5e..efcf556984a 100644
--- a/wisp/wisp-deployment/build.gradle.kts
+++ b/wisp/wisp-deployment/build.gradle.kts
@@ -6,11 +6,4 @@ dependencies {
   testImplementation(project(":wisp-deployment-testing"))
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-feature-testing/build.gradle.kts b/wisp/wisp-feature-testing/build.gradle.kts
index e452658a71b..e3a65e6c835 100644
--- a/wisp/wisp-feature-testing/build.gradle.kts
+++ b/wisp/wisp-feature-testing/build.gradle.kts
@@ -16,11 +16,4 @@ dependencies {
   testImplementation(Dependencies.kotlinTest)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-feature/build.gradle.kts b/wisp/wisp-feature/build.gradle.kts
index dba616bcaec..f8261ec04b9 100644
--- a/wisp/wisp-feature/build.gradle.kts
+++ b/wisp/wisp-feature/build.gradle.kts
@@ -4,11 +4,4 @@ dependencies {
   implementation(Dependencies.loggingApi)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-logging-testing/build.gradle.kts b/wisp/wisp-logging-testing/build.gradle.kts
index 4cea580cc4d..8cfe558c1da 100644
--- a/wisp/wisp-logging-testing/build.gradle.kts
+++ b/wisp/wisp-logging-testing/build.gradle.kts
@@ -11,11 +11,4 @@ dependencies {
   testImplementation(project(":wisp-logging"))
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-logging/build.gradle.kts b/wisp/wisp-logging/build.gradle.kts
index a6a4be85539..380bd4e1a80 100644
--- a/wisp/wisp-logging/build.gradle.kts
+++ b/wisp/wisp-logging/build.gradle.kts
@@ -11,11 +11,4 @@ dependencies {
   testImplementation(project(":wisp-logging-testing"))
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-resource-loader-testing/build.gradle.kts b/wisp/wisp-resource-loader-testing/build.gradle.kts
index 67798752267..654cd31b931 100644
--- a/wisp/wisp-resource-loader-testing/build.gradle.kts
+++ b/wisp/wisp-resource-loader-testing/build.gradle.kts
@@ -10,11 +10,4 @@ dependencies {
   testImplementation(Dependencies.kotlinTest)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-resource-loader/build.gradle.kts b/wisp/wisp-resource-loader/build.gradle.kts
index 5d80b79f2ef..8af2508726b 100644
--- a/wisp/wisp-resource-loader/build.gradle.kts
+++ b/wisp/wisp-resource-loader/build.gradle.kts
@@ -9,11 +9,4 @@ dependencies {
   testImplementation(Dependencies.kotlinTest)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")
diff --git a/wisp/wisp-ssl/build.gradle.kts b/wisp/wisp-ssl/build.gradle.kts
index 28d7247b85b..f23671c9a5e 100644
--- a/wisp/wisp-ssl/build.gradle.kts
+++ b/wisp/wisp-ssl/build.gradle.kts
@@ -10,11 +10,4 @@ dependencies {
   testImplementation(Dependencies.kotlinTest)
 }
 
-afterEvaluate {
-  project.tasks.dokka {
-    outputDirectory = "$rootDir/docs/0.x"
-    outputFormat = "gfm"
-  }
-}
-
 apply(from = "$rootDir/gradle-mvn-publish.gradle")