Integrate Kotlin IDE plugin 1.7.0

Bug: 231736664
Change-Id: Ieb596404ea79a3c80f557e6fd1cf15f5a6d06453

10 files changed, 32 insertions, 28 deletions

diff --git a/.idea/libraries/studio_plugin_Kotlin.xml b/.idea/libraries/studio_plugin_Kotlin.xml
index abd0926ac7d..a867cd8e5fe 100644
--- a/.idea/libraries/studio_plugin_Kotlin.xml
+++ b/.idea/libraries/studio_plugin_Kotlin.xml
@@ -6,10 +6,10 @@
       <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/javaslang-match-2.0.6.jar!/" />
       <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/javax.inject-1.jar!/" />
       <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-common.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.6.21-release-for-android-studio.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-compiler-ir-for-ide-1.6.21-release-for-android-studio.jar!/" />
-      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-jps-common.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.7.0-release-for-android-studio.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-compiler-ir-for-ide-1.7.0-release-for-android-studio.jar!/" />
+      <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-jps-common-for-ide-1.7.0-release-for-android-studio.jar!/" />
       <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlin-plugin.jar!/" />
       <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlinx-collections-immutable-jvm-0.3.4.jar!/" />
       <root url="jar://$PROJECT_DIR$/../../../prebuilts/tools/common/kotlin-plugin/Kotlin/lib/kotlinx-coroutines-core-jvm-1.5.2.jar!/" />
diff --git a/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt b/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt
index 519f2219c0f..6d9e3f3024f 100644
--- a/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt
+++ b/android/src/com/android/tools/idea/actions/annotations/InferAnnotations.kt
@@ -80,10 +80,10 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.usageView.UsageInfo
 import org.jetbrains.android.util.AndroidUtils
 import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightFieldForDecompiledDeclaration
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightMethodForDecompiledDeclaration
 import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
-import org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations.KtLightFieldForDecompiledDeclaration
-import org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations.KtLightMethodForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.util.findAnnotation
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
diff --git a/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt b/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt
index 067b0219fcb..411461abef1 100644
--- a/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt
+++ b/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt
@@ -160,7 +160,7 @@ class ComposableDeclarationCheckerTest : JavaCodeInsightFixtureTestCase() {
       object FakeFoo : Foo {
           <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun composableFunction(param: Boolean): Boolean defined in com.example.FakeFoo, @Composable public abstract fun composableFunction(param: Boolean): Boolean defined in com.example.Foo">override fun composableFunction(param: Boolean)</error> = true
           <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun nonComposableFunction(param: Boolean): Boolean defined in com.example.FakeFoo, public abstract fun nonComposableFunction(param: Boolean): Boolean defined in com.example.Foo">@Composable override fun nonComposableFunction(param: Boolean)</error> = true
-          <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeFoo, public abstract val nonComposableProperty: Boolean defined in com.example.Foo">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun <get-nonComposableProperty>(): Boolean defined in com.example.FakeFoo, public abstract fun <get-nonComposableProperty>(): Boolean defined in com.example.Foo">@Composable get()</error> = true
+          <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeFoo, public abstract val nonComposableProperty: Boolean defined in com.example.Foo">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun `<get-nonComposableProperty>`(): Boolean defined in com.example.FakeFoo, public abstract fun `<get-nonComposableProperty>`(): Boolean defined in com.example.Foo">@Composable get()</error> = true
       }
 
       interface Bar {
@@ -173,9 +173,9 @@ class ComposableDeclarationCheckerTest : JavaCodeInsightFixtureTestCase() {
 
       object FakeBar : Bar {
           <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun composableFunction(param: Boolean): Boolean defined in com.example.FakeBar, @Composable public abstract fun composableFunction(param: Boolean): Boolean defined in com.example.Bar">override fun composableFunction(param: Boolean)</error> = true
-          <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val composableProperty: Boolean defined in com.example.FakeBar, public abstract val composableProperty: Boolean defined in com.example.Bar">override val composableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun <get-composableProperty>(): Boolean defined in com.example.FakeBar, @Composable public abstract fun <get-composableProperty>(): Boolean defined in com.example.Bar">get()</error> = true
+          <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val composableProperty: Boolean defined in com.example.FakeBar, public abstract val composableProperty: Boolean defined in com.example.Bar">override val composableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun `<get-composableProperty>`(): Boolean defined in com.example.FakeBar, @Composable public abstract fun `<get-composableProperty>`(): Boolean defined in com.example.Bar">get()</error> = true
           <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun nonComposableFunction(param: Boolean): Boolean defined in com.example.FakeBar, public abstract fun nonComposableFunction(param: Boolean): Boolean defined in com.example.Bar">@Composable override fun nonComposableFunction(param: Boolean)</error> = true
-          <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeBar, public abstract val nonComposableProperty: Boolean defined in com.example.Bar">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun <get-nonComposableProperty>(): Boolean defined in com.example.FakeBar, public abstract fun <get-nonComposableProperty>(): Boolean defined in com.example.Bar">@Composable get()</error> = true
+          <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeBar, public abstract val nonComposableProperty: Boolean defined in com.example.Bar">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun `<get-nonComposableProperty>`(): Boolean defined in com.example.FakeBar, public abstract fun `<get-nonComposableProperty>`(): Boolean defined in com.example.Bar">@Composable get()</error> = true
       }
         """
     )
diff --git a/kotlin-integration/version.bzl b/kotlin-integration/version.bzl
index 65e20839f8e..5f8c531cf21 100644
--- a/kotlin-integration/version.bzl
+++ b/kotlin-integration/version.bzl
@@ -1,2 +1,2 @@
 # The version of the Kotlin IDE plugin that is bundled in Android Studio.
-KOTLIN_IDE_VERSION = "1.6.21"
+KOTLIN_IDE_VERSION = "1.7.0"
diff --git a/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/ProjectStructureDumper.kt b/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/ProjectStructureDumper.kt
index be10d88046e..9e115291c7f 100644
--- a/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/ProjectStructureDumper.kt
+++ b/project-system-gradle/src/com/android/tools/idea/gradle/project/sync/internal/ProjectStructureDumper.kt
@@ -429,7 +429,7 @@ private fun ProjectDumper.dump(compilerArguments: CommonCompilerArguments) {
     prop("reportOutputFiles") { compilerArguments.reportOutputFiles.takeIf { it }?.toString() }
     prop("reportPerf") { compilerArguments.reportPerf.takeIf { it }?.toString() }
     prop("skipMetadataVersionCheck") { compilerArguments.skipMetadataVersionCheck.takeIf { it }?.toString() }
-    compilerArguments.useExperimental?.forEach { prop("- useExperimental") { it } }
+    compilerArguments.optIn?.forEach { prop("- useExperimental") { it } }
     compilerArguments.verbosePhases?.forEach { prop("- verbosePhases") { it } }
   }
 }
diff --git a/studio/codesign/filelist b/studio/codesign/filelist
index dbacd407de6..f47634cbe79 100644
--- a/studio/codesign/filelist
+++ b/studio/codesign/filelist
@@ -13,6 +13,6 @@
 %prefix%Contents/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar
 %prefix%Contents/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar
 %prefix%Contents/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar
-%prefix%Contents/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio.jar
+%prefix%Contents/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio.jar
 %prefix%Contents/plugins/Kotlin/lib/kotlin-plugin.jar
 %prefix%Contents/plugins/svn4idea/lib/sqlite-jdbc-3.34.0.jar
diff --git a/studio/tests/expected_linux.txt b/studio/tests/expected_linux.txt
index 3440ad8bf5e..5d4585c419b 100644
--- a/studio/tests/expected_linux.txt
+++ b/studio/tests/expected_linux.txt
@@ -755,6 +755,7 @@ android-studio/plugins/Kotlin/kotlinc/license/third_party/qunit_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/scala_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/sl4f_license.txt
+android-studio/plugins/Kotlin/kotlinc/license/third_party/sun_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/teamcity-service-messages_LICENSE.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/testdata/dagger_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_distribution_license.txt
@@ -772,10 +773,10 @@ android-studio/plugins/Kotlin/lib/javaslang-match-2.0.6.jar
 android-studio/plugins/Kotlin/lib/javax.inject-1.jar
 android-studio/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar
 android-studio/plugins/Kotlin/lib/kotlin-common.jar
-android-studio/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio.jar
-android-studio/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.6.21-release-for-android-studio.jar
-android-studio/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.6.21-release-for-android-studio.jar
-android-studio/plugins/Kotlin/lib/kotlin-jps-common.jar
+android-studio/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio.jar
+android-studio/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.7.0-release-for-android-studio.jar
+android-studio/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.7.0-release-for-android-studio.jar
+android-studio/plugins/Kotlin/lib/kotlin-jps-common-for-ide-1.7.0-release-for-android-studio.jar
 android-studio/plugins/Kotlin/lib/kotlin-plugin.jar
 android-studio/plugins/Kotlin/lib/kotlinc_kotlin-reflect.jar
 android-studio/plugins/Kotlin/lib/kotlinc_kotlin-stdlib.jar
diff --git a/studio/tests/expected_mac.txt b/studio/tests/expected_mac.txt
index 3137ff5a519..40bba3f71bb 100644
--- a/studio/tests/expected_mac.txt
+++ b/studio/tests/expected_mac.txt
@@ -743,6 +743,7 @@ Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/q
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/scala_license.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/sl4f_license.txt
+Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/sun_license.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/teamcity-service-messages_LICENSE.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/testdata/dagger_license.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_distribution_license.txt
@@ -760,10 +761,10 @@ Android Studio Preview.app/Contents/plugins/Kotlin/lib/javaslang-match-2.0.6.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/javax.inject-1.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-common.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.6.21-release-for-android-studio.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.6.21-release-for-android-studio.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-jps-common.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.7.0-release-for-android-studio.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.7.0-release-for-android-studio.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-jps-common-for-ide-1.7.0-release-for-android-studio.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-plugin.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlinc_kotlin-reflect.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlinc_kotlin-stdlib.jar
diff --git a/studio/tests/expected_mac_arm.txt b/studio/tests/expected_mac_arm.txt
index e8b0fc93ba3..33eeecbe84c 100644
--- a/studio/tests/expected_mac_arm.txt
+++ b/studio/tests/expected_mac_arm.txt
@@ -754,6 +754,7 @@ Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/q
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/scala_license.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/sl4f_license.txt
+Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/sun_license.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/teamcity-service-messages_LICENSE.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/testdata/dagger_license.txt
 Android Studio Preview.app/Contents/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_distribution_license.txt
@@ -771,10 +772,10 @@ Android Studio Preview.app/Contents/plugins/Kotlin/lib/javaslang-match-2.0.6.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/javax.inject-1.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-common.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.6.21-release-for-android-studio.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.6.21-release-for-android-studio.jar
-Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-jps-common.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.7.0-release-for-android-studio.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.7.0-release-for-android-studio.jar
+Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-jps-common-for-ide-1.7.0-release-for-android-studio.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlin-plugin.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlinc_kotlin-reflect.jar
 Android Studio Preview.app/Contents/plugins/Kotlin/lib/kotlinc_kotlin-stdlib.jar
diff --git a/studio/tests/expected_win.txt b/studio/tests/expected_win.txt
index 0b72ebcec6d..2890fbf6d34 100644
--- a/studio/tests/expected_win.txt
+++ b/studio/tests/expected_win.txt
@@ -760,6 +760,7 @@ android-studio/plugins/Kotlin/kotlinc/license/third_party/qunit_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/rhino_LICENSE.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/scala_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/sl4f_license.txt
+android-studio/plugins/Kotlin/kotlinc/license/third_party/sun_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/teamcity-service-messages_LICENSE.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/testdata/dagger_license.txt
 android-studio/plugins/Kotlin/kotlinc/license/third_party/testdata/eclipse_distribution_license.txt
@@ -777,10 +778,10 @@ android-studio/plugins/Kotlin/lib/javaslang-match-2.0.6.jar
 android-studio/plugins/Kotlin/lib/javax.inject-1.jar
 android-studio/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar
 android-studio/plugins/Kotlin/lib/kotlin-common.jar
-android-studio/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio.jar
-android-studio/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.6.21-release-for-android-studio.jar
-android-studio/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.6.21-release-for-android-studio.jar
-android-studio/plugins/Kotlin/lib/kotlin-jps-common.jar
+android-studio/plugins/Kotlin/lib/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio.jar
+android-studio/plugins/Kotlin/lib/kotlin-compiler-fe10-for-ide-1.7.0-release-for-android-studio.jar
+android-studio/plugins/Kotlin/lib/kotlin-compiler-ir-for-ide-1.7.0-release-for-android-studio.jar
+android-studio/plugins/Kotlin/lib/kotlin-jps-common-for-ide-1.7.0-release-for-android-studio.jar
 android-studio/plugins/Kotlin/lib/kotlin-plugin.jar
 android-studio/plugins/Kotlin/lib/kotlinc_kotlin-reflect.jar
 android-studio/plugins/Kotlin/lib/kotlinc_kotlin-stdlib.jar