Compare commits

...

3 Commits

Author SHA1 Message Date
Andrey Breslav
5b29c44562 Fix EA-57538 - assert: IDELightClassGenerationSupport.getContextForPackage 2014-07-02 19:47:37 +04:00
Natalia Ukhorskaya
9b0f872769 Gradle plugin: unable to build project in multi flavor environment with gradle 0.11+
#KT-5348 Fixed
(cherry picked from commit 09e8d0d)
2014-07-02 14:24:49 +04:00
Andrey Breslav
1d650bf37d Change inspections' level to "WEAK WARNING" + disable "Explicit 'get'" by default 2014-07-02 14:03:52 +04:00
4 changed files with 16 additions and 7 deletions

View File

@@ -747,29 +747,29 @@
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.ExplicitGetInspection"
displayName="Explicit 'get'"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
enabledByDefault="false"
level="WEAK WARNING"
/>
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.IfThenToElvisInspection"
displayName="If-Then foldable to '?:'"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
level="WEAK WARNING"
/>
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.IfThenToSafeAccessInspection"
displayName="If-Then foldable to '?.'"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
level="WEAK WARNING"
/>
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.RemoveExplicitTypeArgsInspection"
displayName="Type arguments are unnecessary"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
level="WEAK WARNING"
/>
<localInspection implementationClass="org.jetbrains.jet.plugin.inspections.SimplifyBinaryNegationInspection"

View File

@@ -26,6 +26,7 @@ import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.Diagnostics;
import org.jetbrains.jet.plugin.JetPluginUtil;
import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
import org.jetbrains.jet.plugin.project.TargetPlatform;
import org.jetbrains.jet.plugin.project.TargetPlatformDetector;
@@ -35,6 +36,8 @@ public class DuplicateJvmSignatureAnnotator implements Annotator {
@Override
public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
if (!(element instanceof JetFile) && !(element instanceof JetDeclaration)) return;
if (!JetPluginUtil.isInSource(element, false)) return;
PsiFile file = element.getContainingFile();
if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != TargetPlatform.JVM) return;

View File

@@ -234,8 +234,8 @@ open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plug
javaSourceList.add(Callable<File?>{ variant.getRenderscriptCompile().getSourceOutputDir() })
if (variant is ApkVariant) {
for (flavour in variant.getProductFlavors().iterator()) {
val flavourSourceSetName = buildTypeSourceSetName + flavour.getName()
for (flavourName in AndroidGradleWrapper.getProductFlavorsNames(variant)) {
val flavourSourceSetName = buildTypeSourceSetName + flavourName
val flavourSourceSet : AndroidSourceSet? = sourceSets.findByName(flavourSourceSetName)
if (flavourSourceSet != null) {
javaSourceList.add(AndroidGradleWrapper.getJavaSrcDirs(flavourSourceSet))

View File

@@ -1,6 +1,7 @@
package org.jetbrains.kotlin.gradle.plugin.android
import com.android.build.gradle.BasePlugin
import com.android.build.gradle.api.ApkVariant
import org.gradle.api.tasks.util.PatternFilterable
import org.jetbrains.annotations.NotNull
@@ -39,4 +40,9 @@ class AndroidGradleWrapper {
static def Set<File> getJavaSrcDirs(Object androidSourceSet) {
return androidSourceSet.getJava().getSrcDirs()
}
@NotNull
static def List<String> getProductFlavorsNames(ApkVariant variant) {
return variant.getProductFlavors().iterator().collect { it.getName() }
}
}