Misc: Fix compilation
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidResourceReferenceAnnotator.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidResourceReferenceAnnotator.kt
index b3990ce..22262ca 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidResourceReferenceAnnotator.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/AndroidResourceReferenceAnnotator.kt
@@ -20,7 +20,7 @@
import com.android.resources.ResourceType.*
import com.android.tools.idea.AndroidPsiUtils.ResourceReferenceType.FRAMEWORK
import com.android.tools.idea.rendering.GutterIconRenderer
-import com.android.tools.idea.rendering.ResourceHelper
+import com.android.tools.idea.res.ResourceHelper
import com.intellij.lang.annotation.AnnotationHolder
import com.intellij.lang.annotation.Annotator
import com.intellij.psi.PsiElement
diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/ResourceReferenceAnnotatorUtil.java b/idea/idea-android/src/org/jetbrains/kotlin/android/ResourceReferenceAnnotatorUtil.java
index 2279c5c..790a139 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/ResourceReferenceAnnotatorUtil.java
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/ResourceReferenceAnnotatorUtil.java
@@ -23,9 +23,9 @@
import com.android.ide.common.resources.ResourceResolver;
import com.android.resources.ResourceType;
import com.android.tools.idea.configurations.Configuration;
-import com.android.tools.idea.rendering.AppResourceRepository;
-import com.android.tools.idea.rendering.LocalResourceRepository;
-import com.android.tools.idea.rendering.ResourceHelper;
+import com.android.tools.idea.res.AppResourceRepository;
+import com.android.tools.idea.res.LocalResourceRepository;
+import com.android.tools.idea.res.ResourceHelper;
import com.android.utils.XmlUtils;
import com.google.common.base.Charsets;
import com.google.common.io.Files;
@@ -47,7 +47,7 @@
import com.intellij.util.ui.ColorIcon;
import com.intellij.util.ui.EmptyIcon;
import org.jetbrains.android.facet.AndroidFacet;
-import org.jetbrains.android.uipreview.ColorPicker;
+import com.android.tools.idea.ui.resourcechooser.ColorPicker;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.w3c.dom.Document;
diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestBase.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestBase.java
index 1dc265d..e47883c 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestBase.java
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestBase.java
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.android;
import com.android.sdklib.IAndroidTarget;
-import com.android.tools.idea.rendering.ResourceHelper;
+import com.android.tools.idea.res.ResourceHelper;
import com.android.tools.idea.startup.ExternalAnnotationsSupport;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.application.ex.PathManagerEx;
diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
index d45c356..dcf6b52 100644
--- a/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
+++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/AndroidTestCase.java
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.android;
import com.android.SdkConstants;
-import com.android.ide.common.rendering.RenderSecurityManager;
+import com.android.tools.idea.rendering.RenderSecurityManager;
import com.android.tools.idea.startup.AndroidCodeStyleSettingsModifier;
import com.intellij.analysis.AnalysisScope;
import com.intellij.codeInspection.GlobalInspectionTool;
diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
index fa3fef4..82150eb 100644
--- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
+++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.android.synthetic.idea.res
import com.android.builder.model.SourceProvider
-import com.android.tools.idea.gradle.AndroidGradleModel
import com.android.tools.idea.gradle.project.model.AndroidModuleModel
import com.intellij.openapi.module.Module
import com.intellij.openapi.roots.ProjectRootModificationTracker
@@ -115,8 +114,8 @@
val variants = mutableListOf(androidFacet.mainSourceProvider.toVariant())
- AndroidGradleModel.get(androidFacet.module)?.let { androidGradleModel ->
- androidGradleModel.activeSourceProviders.filter { it.name != "main" }.forEach { sourceProvider ->
+ AndroidModuleModel.get(androidFacet.module)?.let { androidModuleModel ->
+ androidModuleModel.activeSourceProviders.filter { it.name != "main" }.forEach { sourceProvider ->
variants += sourceProvider.toVariant()
}
}
