Merge branch '5.3.x'

sbrannen · sbrannen · commit c25aefdb2bc6 · 2021-10-05T15:24:11.000+02:00
diff --git a/gradle/docs-dokka.gradle b/gradle/docs-dokka.gradle
@@ -17,7 +17,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
 			}
 			externalDocumentationLink {
-				url.set(new URL("https://hamcrest.org/JavaHamcrest/javadoc/2.1/"))
+				url.set(new URL("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"))
 			}
 			externalDocumentationLink {
 				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {`
`17`	`17`	`url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))`
`18`	`18`	`}`
`19`	`19`	`externalDocumentationLink {`
`20`		`- url.set(new URL("https://hamcrest.org/JavaHamcrest/javadoc/2.1/"))`
	`20`	`+ url.set(new URL("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"))`
`21`	`21`	`}`
`22`	`22`	`externalDocumentationLink {`
`23`	`23`	`url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))`