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

Revert "Suppress warning for mvn+kapt+jdk9"

Browse Source 
This reverts commit 3fc91b01
This commit is contained in:
Aleksei.Cherepanov
2022-11-17 08:45:27 +01:00
parent bbd8aed419
commit 123caee0ed
1 changed files with 7 additions and 21 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/kapt/KaptJVMCompilerMojo.java
+3 -17
View File
@@ -40,9 +40,7 @@ import java.util.stream.Collectors;
import static org.jetbrains.kotlin.maven.Util.joinArrays; import static org.jetbrains.kotlin.maven.Util.joinArrays;
import static org.jetbrains.kotlin.maven.kapt.AnnotationProcessingManager.*; import static org.jetbrains.kotlin.maven.kapt.AnnotationProcessingManager.*;
/** /** @noinspection UnusedDeclaration */
* @noinspection UnusedDeclaration
*/
@Mojo(name = "kapt", defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) @Mojo(name = "kapt", defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresDependencyResolution = ResolutionScope.COMPILE)
public class KaptJVMCompilerMojo extends K2JVMCompileMojo { public class KaptJVMCompilerMojo extends K2JVMCompileMojo {
@Parameter @Parameter
@@ -189,8 +187,7 @@ public class KaptJVMCompilerMojo extends K2JVMCompileMojo {
} }
@Override @Override
protected void configureSpecificCompilerArguments(@NotNull K2JVMCompilerArguments arguments, @NotNull List<File> sourceRoots) protected void configureSpecificCompilerArguments(@NotNull K2JVMCompilerArguments arguments, @NotNull List<File> sourceRoots) throws MojoExecutionException {
throws MojoExecutionException {
super.configureSpecificCompilerArguments(arguments, sourceRoots); super.configureSpecificCompilerArguments(arguments, sourceRoots);
AnnotationProcessingManager.ResolvedArtifacts resolvedArtifacts; AnnotationProcessingManager.ResolvedArtifacts resolvedArtifacts;
@@ -223,16 +220,6 @@ public class KaptJVMCompilerMojo extends K2JVMCompileMojo {
getLog().warn("Can't determine Java home, 'java.home' property does not exist"); getLog().warn("Can't determine Java home, 'java.home' property does not exist");
return null; return null;
} }
val jdkVersion = try {
System.getProperty("java.specification.version") ?.toInt()
}
catch (e:NumberFormatException){
// we got 1.8 or 1.6
null
} ?:0
if (jdkVersion >= 9) return null
File javaHome = new File(javaHomePath); File javaHome = new File(javaHomePath);
File toolsJar = new File(javaHome, "lib/tools.jar"); File toolsJar = new File(javaHome, "lib/tools.jar");
if (toolsJar.exists()) { if (toolsJar.exists()) {
@@ -337,8 +324,7 @@ public class KaptJVMCompilerMojo extends K2JVMCompileMojo {
oos.flush(); oos.flush();
return Base64.getEncoder().encodeToString(os.toByteArray()); return Base64.getEncoder().encodeToString(os.toByteArray());
} } catch (IOException e) {
catch (IOException e) {
// Should not occur // Should not occur
throw new RuntimeException(e); throw new RuntimeException(e);
} }