Android Extensions: Fix compatibility with Android Studio 3.0
diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/model/impl/AndroidModuleInfoProviderImpl.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/model/impl/AndroidModuleInfoProviderImpl.kt index d343866..fc20e30 100644 --- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/model/impl/AndroidModuleInfoProviderImpl.kt +++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/model/impl/AndroidModuleInfoProviderImpl.kt
@@ -6,15 +6,14 @@ package org.jetbrains.kotlin.android.model.impl import com.android.builder.model.SourceProvider -import com.android.tools.idea.gradle.AndroidGradleModel +import com.android.tools.idea.gradle.project.model.AndroidModuleModel +import com.android.tools.idea.res.AppResourceRepository import com.intellij.openapi.module.Module import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.android.facet.AndroidFacet import org.jetbrains.kotlin.android.model.AndroidModuleInfoProvider import java.io.File -private typealias AndroidModuleModel = AndroidGradleModel - class AndroidModuleInfoProviderImpl(override val module: Module) : AndroidModuleInfoProvider { private val androidFacet: AndroidFacet? get() = AndroidFacet.getInstance(module) @@ -36,7 +35,7 @@ } override fun getApplicationResourceDirectories(createIfNecessary: Boolean): Collection<VirtualFile> { - return androidFacet?.getAppResources(createIfNecessary)?.resourceDirs ?: emptyList() + return AppResourceRepository.getOrCreateInstance(module)?.resourceDirs ?: emptyList() } override fun getAllSourceProviders(): List<AndroidModuleInfoProvider.SourceProviderMirror> {