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

Resolve also transitive dependencies for compilerPluginClasspath in maven

Browse Source 
This allows to depend on actual compiler plugin instead of embedding it into maven compiler plugin.

^KT-52811 In Progress
This commit is contained in:
Yahor Berdnikau
2023-03-27 20:20:30 +02:00
committed by Space Team
parent e1bd7d7b5d
commit 8ad67faa60
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java
+14 -1
View File
@@ -10,8 +10,10 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.ArrayUtil;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
@@ -52,6 +54,9 @@ public abstract class KotlinCompileMojoBase<A extends CommonCompilerArguments> e
@Component
protected RepositorySystem system;
@Parameter(defaultValue = "${session}", readonly = true, required = true)
protected MavenSession session;
/**
* The source directories containing the sources to be compiled.
*/
@@ -282,9 +287,17 @@ public abstract class KotlinCompileMojoBase<A extends CommonCompilerArguments> e
List<File> files = new ArrayList<>();
ArtifactRepository localRepo = session == null ? null : session.getLocalRepository();
List<ArtifactRepository> remoteRepos = session == null ? null : session.getRequest().getRemoteRepositories();
for (Dependency dependency : mojoExecution.getPlugin().getDependencies()) {
Artifact artifact = system.createDependencyArtifact(dependency);
ArtifactResolutionResult resolved = system.resolve(new ArtifactResolutionRequest().setArtifact(artifact));
ArtifactResolutionRequest request = new ArtifactResolutionRequest().setArtifact(artifact);
if (localRepo != null) request.setLocalRepository(localRepo);
if (remoteRepos != null) request.setRemoteRepositories(remoteRepos);
if (localRepo != null || remoteRepos != null) request.setResolveTransitively(true);
ArtifactResolutionResult resolved = system.resolve(request);
for (Artifact resolvedArtifact : resolved.getArtifacts()) {
File file = resolvedArtifact.getFile();
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/kapt/KaptJVMCompilerMojo.java
-3
View File
@@ -74,9 +74,6 @@ public class KaptJVMCompilerMojo extends K2JVMCompileMojo {
@Component
private ArtifactHandlerManager artifactHandlerManager;
@Parameter(defaultValue = "${session}", readonly = true, required = true)
private MavenSession session;
@Component
private ResolutionErrorHandler resolutionErrorHandler;