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

Missed sdk annotations for Android Sdk

Browse Source 
#KT-3965 Fixed
This commit is contained in:
Natalia.Ukhorskaya
2013-09-10 16:22:26 +04:00
parent 22a328e41f
commit 188e8b983e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java
+14 -1
View File
@@ -31,8 +31,10 @@ import org.jetbrains.jps.model.JpsDummyElement;
import org.jetbrains.jps.model.java.*; import org.jetbrains.jps.model.java.*;
import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsLibrary;
import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.library.sdk.JpsSdk;
import org.jetbrains.jps.model.library.sdk.JpsSdkType;
import org.jetbrains.jps.model.module.JpsDependencyElement; import org.jetbrains.jps.model.module.JpsDependencyElement;
import org.jetbrains.jps.model.module.JpsLibraryDependency; import org.jetbrains.jps.model.module.JpsLibraryDependency;
import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.model.module.JpsSdkDependency; import org.jetbrains.jps.model.module.JpsSdkDependency;
import java.io.File; import java.io.File;
@@ -109,7 +111,8 @@ public class KotlinBuilderModuleScriptGenerator {
private static List<File> findAnnotationRoots(@NotNull ModuleBuildTarget target) { private static List<File> findAnnotationRoots(@NotNull ModuleBuildTarget target) {
List<File> annotationRootFiles = ContainerUtil.newArrayList(); List<File> annotationRootFiles = ContainerUtil.newArrayList();
JpsSdk<JpsDummyElement> sdk = target.getModule().getSdk(JpsJavaSdkType.INSTANCE); JpsModule module = target.getModule();
JpsSdk sdk = module.getSdk(getSdkType(module));
if (sdk != null) { if (sdk != null) {
annotationRootFiles.addAll(sdk.getParent().getFiles(JpsAnnotationRootType.INSTANCE)); annotationRootFiles.addAll(sdk.getParent().getFiles(JpsAnnotationRootType.INSTANCE));
} }
@@ -131,6 +134,16 @@ public class KotlinBuilderModuleScriptGenerator {
return annotationRootFiles; return annotationRootFiles;
} }
@NotNull
private static JpsSdkType getSdkType(@NotNull JpsModule module) {
for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) {
if (dependency instanceof JpsSdkDependency) {
return ((JpsSdkDependency) dependency).getSdkType();
}
}
return JpsJavaSdkType.INSTANCE;
}
@NotNull @NotNull
private static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { private static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) {
return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly() return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly()