MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle: resolve dependency sources in all defined repositories (IDEA-178891)

Browse Source
This commit is contained in:
Vladislav.Soroka
2018-07-26 17:05:28 +03:00
parent 659a78b4bf
commit e7d2931e40
2 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java
+4
View File
@@ -234,6 +234,10 @@ public class LibraryDataService extends AbstractProjectDataService<LibraryData,
HashSet<String> toAddPerType = ContainerUtilRt.newHashSet(externalLibrary.getPaths(pathType));
toAdd.put(ideType, toAddPerType);
// do not remove attached or manually added sources/javadocs if nothing to add
if(pathType != LibraryPathType.BINARY && toAddPerType.isEmpty()) {
continue;
}
HashSet<String> toRemovePerType = ContainerUtilRt.newHashSet();
toRemove.put(ideType, toRemovePerType);
plugins/gradle/java/src/util/GradleAttachSourcesProvider.java
+50 -8
View File
@@ -36,6 +36,7 @@ import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
@@ -43,11 +44,13 @@ import com.intellij.psi.PsiFile;
import com.intellij.util.containers.ContainerUtil;
import org.gradle.initialization.BuildLayoutParameters;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.service.project.GradleProjectResolverUtil;
import org.jetbrains.plugins.gradle.service.task.GradleTaskManager;
import org.jetbrains.plugins.gradle.settings.GradleSettings;
import java.io.File;
import java.io.IOException;
import java.util.*;
import static com.intellij.jarFinder.InternetAttachSourceProvider.attachSourceJar;
@@ -93,21 +96,46 @@ public class GradleAttachSourcesProvider implements AttachSourcesProvider {
final String gradlePath = GradleProjectResolverUtil.getGradlePath(module);
if (gradlePath == null) return ActionCallback.REJECTED;
final String sourcesLocationFilePath;
final File sourcesLocationFile;
try {
sourcesLocationFile = new File(FileUtil.createTempDirectory("sources", "loc"), "path.tmp");
sourcesLocationFilePath = StringUtil.escapeBackSlashes(sourcesLocationFile.getCanonicalPath());
Runtime.getRuntime().addShutdownHook(new Thread(() -> FileUtil.delete(sourcesLocationFile)));
}
catch (IOException e) {
GradleLog.LOG.warn(e);
return ActionCallback.REJECTED;
}
final String taskName = "DownloadSources";
// @formatter:off
String initScript = "allprojects {\n" +
" afterEvaluate { project ->\n" +
" if(project.path == '" + gradlePath + "') {\n" +
" project.configurations.maybeCreate('downloadSources')\n" +
" project.dependencies.add('downloadSources', '" + artifactCoordinates + ":sources" + "')\n" +
" project.tasks.create(name: '" + taskName + "', overwrite: true) {\n" +
" doLast {\n" +
" project.configurations.downloadSources.resolve()\n" +
" def configuration = null\n" +
" def repository = project.repositories.toList().find {\n" +
" project.repositories.clear()\n" +
" project.repositories.add(it)\n" +
" configuration = project.configurations.create('downloadSourcesFrom_' + it.name + '_' + UUID.randomUUID())\n" +
" configuration.transitive = false\n" +
" project.dependencies.add(configuration.name, '" + artifactCoordinates + ":sources" + "')\n" +
" configuration.resolvedConfiguration.lenientConfiguration.getFiles().any()\n" +
" }\n" +
" if (!repository) {\n" +
" configuration = project.configurations.create('downloadSources_' + UUID.randomUUID())\n" +
" configuration.transitive = false\n" +
" project.dependencies.add(configuration.name, '" + artifactCoordinates + ":sources" + "')\n" +
" configuration.resolve()\n" +
" }\n" +
" new File('" + sourcesLocationFilePath + "').write configuration?.singleFile?.path\n" +
" }\n" +
" }\n" +
" }\n" +
" }\n" +
"}\n";
// @formatter:on
UserDataHolderBase userData = new UserDataHolderBase();
userData.putUserData(GradleTaskManager.INIT_SCRIPT_KEY, initScript);
@@ -123,13 +151,26 @@ public class GradleAttachSourcesProvider implements AttachSourcesProvider {
new TaskCallback() {
@Override
public void onSuccess() {
File sourceJar = getSourceFile(artifactCoordinates, libraryOrderEntry.getFiles(OrderRootType.CLASSES)[0], project);
VirtualFile classesFile = libraryOrderEntry.getFiles(OrderRootType.CLASSES)[0];
File sourceJar = getSourceFile(artifactCoordinates, classesFile, project);
if (sourceJar == null) {
try {
sourceJar = new File(FileUtil.loadFile(sourcesLocationFile));
FileUtil.delete(sourcesLocationFile);
}
catch (IOException e) {
GradleLog.LOG.warn(e);
}
}
File finalSourceJar = sourceJar;
ApplicationManager.getApplication().invokeLater(() -> {
final Set<Library> libraries = new HashSet<>();
for (LibraryOrderEntry orderEntry : orderEntries) {
ContainerUtil.addIfNotNull(libraries, orderEntry.getLibrary());
}
attachSourceJar(sourceJar, libraries);
if (finalSourceJar != null) {
attachSourceJar(finalSourceJar, libraries);
}
resultWrapper.setDone();
});
}
@@ -149,7 +190,7 @@ public class GradleAttachSourcesProvider implements AttachSourcesProvider {
});
}
@NotNull
@Nullable
private static File getSourceFile(String artifactCoordinates, VirtualFile classesFile, Project project) {
LibraryData data = new LibraryData(GradleConstants.SYSTEM_ID, artifactCoordinates);
data.addPath(LibraryPathType.BINARY, VfsUtil.getLocalFile(classesFile).getPath());
@@ -157,7 +198,8 @@ public class GradleAttachSourcesProvider implements AttachSourcesProvider {
File gradleUserHome =
serviceDirectory != null ? new File(serviceDirectory) : new BuildLayoutParameters().getGradleUserHomeDir();
attachSourcesAndJavadocFromGradleCacheIfNeeded(gradleUserHome, data);
return new File(data.getPaths(LibraryPathType.SOURCE).iterator().next());
Iterator<String> iterator = data.getPaths(LibraryPathType.SOURCE).iterator();
return iterator.hasNext() ? new File(iterator.next()) : null;
}
private static Map<LibraryOrderEntry, Module> getGradleModules(List<LibraryOrderEntry> libraryOrderEntries) {