Bump Kotlin to 1.7.0-RC (#2508)

* `UnresolvedType` is replaced with `ErrorType` in https://github.com/JetBrains/kotlin/commit/b5933c70e20a0dfd788d8d4a6c04ca0d16f7c731

*  Support `sig` files in https://github.com/JetBrains/kotlin/commit/22b368849338cae684601c9b1ead31ebb1fd81cf

* `org.jetbrains.kotlin.idea.kdoc.resolveKDocSampleLink` is removed in https://github.com/JetBrains/intellij-community/commit/e4af6f96c8d4e2318d04eddf658a4c4e8c60b2e6

* `org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName` is deprecated

* `org.codehaus.plexus.archiver.AbstractArchiver.addDirectory` is deprecated https://codehaus-plexus.github.io/plexus-archiver/apidocs/org/codehaus/plexus/archiver/Archiver.html#addDirectory-java.io.File-java.lang.String:A-java.lang.String:A-

* Make `clean` independent from `setupMaven`

* Set up JDK classpath roots explicitly

because of https://github.com/JetBrains/kotlin/commit/f89765eb33dd95c8de33a919cca83651b326b246

* Add JPS model and faxml dependencies

* Fix test

* Exclude compiler from buildscript in integration test

* Exclude `com.intellij` package from compiler

* Update kotlin version in integration tests

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocIndexTest.kt b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocIndexTest.kt
index 22348ce1..abb963a6 100644
--- a/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocIndexTest.kt
+++ b/plugins/javadoc/src/test/kotlin/org/jetbrains/dokka/javadoc/JavadocIndexTest.kt
@@ -126,7 +126,7 @@ internal class JavadocIndexTest : AbstractJavadocTemplateMapTest() {
             class Clazz {
                 fun funName(param: List<String>) {}
                 fun funName(param: String) {}
-                fun funName(param: Map<String>) {}
+                fun funName(param: Map<String, String>>) {}
                 fun funName(param: Int) {}
             }
         """.trimIndent()
@@ -144,10 +144,10 @@ internal class JavadocIndexTest : AbstractJavadocTemplateMapTest() {
                 assertEquals(1, it.callable!!.params.size)
             }
 
-            assertEquals("[kotlin.String]", indexElementDRIs[0].getParam(0))
-            assertEquals("kotlin.Int", indexElementDRIs[1].getParam(0))
-            assertEquals("kotlin.String", indexElementDRIs[2].getParam(0))
-            assertEquals("kotlin.collections.List[kotlin.String]", indexElementDRIs[3].getParam(0))
+            assertEquals("kotlin.Int", indexElementDRIs[0].getParam(0))
+            assertEquals("kotlin.String", indexElementDRIs[1].getParam(0))
+            assertEquals("kotlin.collections.List[kotlin.String]", indexElementDRIs[2].getParam(0))
+            assertEquals("kotlin.collections.Map[kotlin.String,kotlin.String]", indexElementDRIs[3].getParam(0))
         }
     }