Minor: fix deprecations in Kotlin Android Extensions code

plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt

@@ -68,7 +68,7 @@ public class AndroidCommandLineProcessor : CommandLineProcessor {
 
 public class CliAndroidDeclarationsProvider(private val project: Project) : ExternalDeclarationsProvider {
     override fun getExternalDeclarations(moduleInfo: ModuleInfo?): Collection<JetFile> {
-        val parser = ServiceManager.getService<AndroidUIXmlProcessor>(project, javaClass<AndroidUIXmlProcessor>())
+        val parser = ServiceManager.getService(project, javaClass<AndroidUIXmlProcessor>())
         return parser.parseToPsi() ?: listOf()
     }
 }

plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt

@@ -199,7 +199,7 @@ public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
     }
 
     private fun CallableDescriptor.getAndroidPackage(): String? {
-        return DescriptorToSourceUtils.getContainingFile(this)?.getUserData<String>(AndroidConst.ANDROID_USER_PACKAGE)
+        return DescriptorToSourceUtils.getContainingFile(this)?.getUserData(AndroidConst.ANDROID_USER_PACKAGE)
     }
 
     private fun ResolvedCall<*>.getReceiverDeclarationDescriptor(): ClassifierDescriptor? {
@@ -337,6 +337,7 @@ public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
                 loadId()
                 iv.invokevirtual("android/view/View", "findViewById", "(I)Landroid/view/View;", false)
             }
+            else -> throw IllegalStateException("Can't generate code for $androidClassType")
         }
         iv.store(2, viewType)
 

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt

@@ -35,8 +35,7 @@ public abstract class AndroidResourceManager(val project: Project) {
     public open fun propertyToXmlAttributes(property: JetProperty): List<PsiElement> = listOf()
 
     public fun getLayoutXmlFiles(): Map<String, List<PsiFile>> {
-        val info = androidModuleInfo
-        if (info == null) return mapOf()
+        val info = androidModuleInfo ?: return mapOf()
 
         val psiManager = PsiManager.getInstance(project)
         val fileManager = VirtualFileManager.getInstance()
@@ -68,8 +67,8 @@ public abstract class AndroidResourceManager(val project: Project) {
 
     companion object {
         public fun getInstance(module: Module): AndroidResourceManager {
-            val service = ModuleServiceManager.getService<AndroidResourceManager>(module, javaClass<AndroidResourceManager>())
-            return service ?: module.getComponent<AndroidResourceManager>(javaClass<AndroidResourceManager>())
+            val service = ModuleServiceManager.getService(module, javaClass<AndroidResourceManager>())
+            return service ?: module.getComponent(javaClass<AndroidResourceManager>())
         }
     }
 

plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/KotlinWriter.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.lang.resolve.android
 
-trait KotlinWriter {
+interface KotlinWriter {
     fun toStringBuffer(): StringBuffer
 }