azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android plugins are now test dependencies, not compile-time

Browse Source
This commit is contained in:
Yan Zhulanow
2014-11-28 20:34:36 +03:00
parent 638fb7526c
commit edac24df74
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea.iml
+2 -2
View File
@@ -45,7 +45,7 @@
<orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" /> <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
<orderEntry type="module" module-name="util" /> <orderEntry type="module" module-name="util" />
<orderEntry type="library" name="android_tests" level="project" /> <orderEntry type="library" name="android_tests" level="project" />
<orderEntry type="module" module-name="android-compiler-plugin" /> <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
<orderEntry type="module" module-name="android-idea-plugin" /> <orderEntry type="module" module-name="android-idea-plugin" scope="TEST" />
</component> </component>
</module> </module>
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt
-2
View File
@@ -30,9 +30,7 @@ import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions
import org.jetbrains.kotlin.idea.findUsages.toJavaMethodOptions import org.jetbrains.kotlin.idea.findUsages.toJavaMethodOptions
import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlProcessor
import com.intellij.psi.xml.XmlAttribute import com.intellij.psi.xml.XmlAttribute
import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetProperty
import com.intellij.find.findUsages.JavaVariableFindUsagesOptions import com.intellij.find.findUsages.JavaVariableFindUsagesOptions
import java.util.ArrayList import java.util.ArrayList
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
-3
View File
@@ -42,9 +42,6 @@ import org.jetbrains.kotlin.resolve.OverrideResolver
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.jet.lang.resolve.android.isAndroidSyntheticElement
import com.intellij.openapi.components.ServiceManager
import org.jetbrains.jet.lang.resolve.android.AndroidUIXmlParser
public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() {
override fun canProcessElement(element: PsiElement): Boolean = element.namedUnwrappedElement is JetProperty override fun canProcessElement(element: PsiElement): Boolean = element.namedUnwrappedElement is JetProperty