From fd763bde1732b3b186d12da93088799e2f8062df Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 22 Nov 2017 18:27:29 +0100 Subject: [PATCH] Reorder imports to avoid merge conflict (cherry picked from commit 4286cce) --- .../kotlin/android/configure/AndroidGradleModelFacade.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/AndroidGradleModelFacade.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/AndroidGradleModelFacade.kt index 814fca0fae8..a6b6d9f26ba 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/AndroidGradleModelFacade.kt +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/AndroidGradleModelFacade.kt @@ -32,7 +32,6 @@ package org.jetbrains.kotlin.android.configure -import com.android.builder.model.Library import com.android.tools.idea.gradle.project.sync.idea.data.service.AndroidProjectKeys import com.intellij.openapi.externalSystem.model.DataNode import com.intellij.openapi.externalSystem.model.project.ModuleData @@ -42,6 +41,7 @@ import org.gradle.tooling.model.UnsupportedMethodException import org.gradle.tooling.model.idea.IdeaProject import org.jetbrains.kotlin.idea.inspections.gradle.KotlinGradleModelFacade import org.jetbrains.kotlin.idea.inspections.gradle.findModulesByNames +import com.android.builder.model.Library class AndroidGradleModelFacade : KotlinGradleModelFacade { override fun getResolvedKotlinStdlibVersionByModuleData(moduleData: DataNode<*>, libraryIds: List): String? {