From 921fa62667fdc9fad74f69e5209614aeb9204648 Mon Sep 17 00:00:00 2001
From: Rob Fletcher <rfletcher@netflix.com>
Date: Mon, 9 Dec 2019 17:30:18 -0800
Subject: [PATCH] Fix external documentation links in Dokka config

---
 .github/workflows/release.yml              | 18 ------------------
 strikt-gradle/strikt-gradle.gradle.kts     |  8 +++++---
 strikt-jackson/strikt-jackson.gradle.kts   |  7 +++++--
 strikt-protobuf/strikt-protobuf.gradle.kts |  8 +++++---
 strikt-spring/strikt-spring.gradle.kts     |  8 +++++---
 5 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5880c893..160f5e74 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,28 +18,10 @@ jobs:
         env:
           BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
           BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
-
-  site:
-    name: Publish site
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-      - name: Set up Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
       - name: Publish site
         run: ./gradlew :site:orchidDeploy -Prelease.useLastTag=true -Penv=prod
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-
-  announce:
-    name: Announce release
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
       - name: Tweet release announcement
         uses: xorilog/twitter-action@0.2
         with:
diff --git a/strikt-gradle/strikt-gradle.gradle.kts b/strikt-gradle/strikt-gradle.gradle.kts
index 5f52c170..b06c7837 100644
--- a/strikt-gradle/strikt-gradle.gradle.kts
+++ b/strikt-gradle/strikt-gradle.gradle.kts
@@ -20,9 +20,11 @@ dependencies {
 
 tasks.dokka {
   configuration {
-    externalDocumentationLink {
-      url =
-        URL("https://docs.gradle.org/${GradleVersion.current().version}/javadoc/")
+    "https://docs.gradle.org/${GradleVersion.current().version}/javadoc/".also {
+      externalDocumentationLink {
+        url = URL(it)
+        packageListUrl = URL(it + "package-list")
+      }
     }
   }
 }
diff --git a/strikt-jackson/strikt-jackson.gradle.kts b/strikt-jackson/strikt-jackson.gradle.kts
index f3509195..d11fdde0 100644
--- a/strikt-jackson/strikt-jackson.gradle.kts
+++ b/strikt-jackson/strikt-jackson.gradle.kts
@@ -18,8 +18,11 @@ dependencies {
 
 tasks.dokka {
   configuration {
-    externalDocumentationLink {
-      url = URL("https://fasterxml.github.io/jackson-databind/javadoc/2.10/")
+    "https://fasterxml.github.io/jackson-databind/javadoc/2.10/".also {
+      externalDocumentationLink {
+        url = URL(it)
+        packageListUrl = URL(it + "package-list")
+      }
     }
   }
 }
diff --git a/strikt-protobuf/strikt-protobuf.gradle.kts b/strikt-protobuf/strikt-protobuf.gradle.kts
index 477ace58..4afb75f3 100644
--- a/strikt-protobuf/strikt-protobuf.gradle.kts
+++ b/strikt-protobuf/strikt-protobuf.gradle.kts
@@ -21,9 +21,11 @@ dependencies {
 
 tasks.dokka {
   configuration {
-    externalDocumentationLink {
-      url =
-        URL("https://developers.google.com/protocol-buffers/docs/reference/java/")
+    "https://developers.google.com/protocol-buffers/docs/reference/java/".also {
+      externalDocumentationLink {
+        url = URL(it)
+        packageListUrl = URL(it + "package-list")
+      }
     }
   }
 }
diff --git a/strikt-spring/strikt-spring.gradle.kts b/strikt-spring/strikt-spring.gradle.kts
index b463b1bf..f175ac14 100644
--- a/strikt-spring/strikt-spring.gradle.kts
+++ b/strikt-spring/strikt-spring.gradle.kts
@@ -24,9 +24,11 @@ dependencies {
 
 tasks.dokka {
   configuration {
-    externalDocumentationLink {
-      url =
-        URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/")
+    "https://docs.spring.io/spring-framework/docs/current/javadoc-api/".also {
+      externalDocumentationLink {
+        url = URL(it)
+        packageListUrl = URL(it + "package-list")
+      }
     }
   }
 }