Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>tags/V1_9_19
package org.aspectj.ajdt.internal.core.builder; | package org.aspectj.ajdt.internal.core.builder; | ||||
import org.aspectj.bridge.IProgressListener; | import org.aspectj.bridge.IProgressListener; | ||||
import org.eclipse.core.resources.IProject; | |||||
import org.eclipse.core.runtime.IProgressMonitor; | import org.eclipse.core.runtime.IProgressMonitor; | ||||
import org.aspectj.org.eclipse.jdt.internal.core.builder.BuildNotifier; | import org.aspectj.org.eclipse.jdt.internal.core.builder.BuildNotifier; | ||||
import java.util.function.BooleanSupplier; | |||||
/** | /** | ||||
* @author colyer | * @author colyer | ||||
* | * | ||||
* @param monitor | * @param monitor | ||||
* @param project | * @param project | ||||
*/ | */ | ||||
public AjBuildNotifier(IProgressMonitor monitor, IProject project) { | |||||
super(monitor, project); | |||||
public AjBuildNotifier(IProgressMonitor monitor, int buildKind, BooleanSupplier interruptSupplier) { | |||||
super(monitor, buildKind, interruptSupplier); | |||||
} | } | ||||
/* (non-Javadoc) | /* (non-Javadoc) |
import java.util.Locale; | import java.util.Locale; | ||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Properties; | import java.util.Properties; | ||||
import java.util.function.BooleanSupplier; | |||||
import org.aspectj.ajdt.core.AspectJCore; | import org.aspectj.ajdt.core.AspectJCore; | ||||
import org.aspectj.ajdt.internal.compiler.CompilerAdapter; | import org.aspectj.ajdt.internal.compiler.CompilerAdapter; | ||||
* @see org.eclipse.jdt.internal.core.builder.JavaBuilder#createBuildNotifier(org.eclipse.core.runtime.IProgressMonitor, | * @see org.eclipse.jdt.internal.core.builder.JavaBuilder#createBuildNotifier(org.eclipse.core.runtime.IProgressMonitor, | ||||
* org.eclipse.core.resources.IProject) | * org.eclipse.core.resources.IProject) | ||||
*/ | */ | ||||
protected BuildNotifier createBuildNotifier(IProgressMonitor monitor, IProject currentProject) { | |||||
return new AjBuildNotifier(monitor, currentProject); | |||||
protected BuildNotifier createBuildNotifier(IProgressMonitor monitor, int buildKind, BooleanSupplier interruptSupplier) { | |||||
return new AjBuildNotifier(monitor, buildKind, interruptSupplier); | |||||
} | } | ||||
private void initWorldAndWeaver(AjCompilerOptions options) { | private void initWorldAndWeaver(AjCompilerOptions options) { |
<maven.javadoc.skip>true</maven.javadoc.skip> | <maven.javadoc.skip>true</maven.javadoc.skip> | ||||
<!-- Dependency versions --> | <!-- Dependency versions --> | ||||
<jdt.core.version>1.9.9.1</jdt.core.version> | |||||
<asm.version>9.2</asm.version> | |||||
<jdt.core.version>1.9.10-SNAPSHOT</jdt.core.version> | |||||
<asm.version>9.3</asm.version> | |||||
<lib.ant.version>1.6.3</lib.ant.version> | <lib.ant.version>1.6.3</lib.ant.version> | ||||
<lib.ant.xerces.version>2.6.2</lib.ant.xerces.version> | <lib.ant.xerces.version>2.6.2</lib.ant.xerces.version> | ||||
<lib.regexp.version>1.2</lib.regexp.version> | <lib.regexp.version>1.2</lib.regexp.version> |
static final String[] TARGET_INPUTS = new String[] { | static final String[] TARGET_INPUTS = new String[] { | ||||
"1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", | "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", | ||||
"10", "11", "12", "13", "14", "15", "16", "17", "18" | |||||
"10", "11", "12", "13", "14", "15", "16", "17", "18", "19" | |||||
}; | }; | ||||
static final String[] SOURCE_INPUTS = new String[] { | static final String[] SOURCE_INPUTS = new String[] { | ||||
"1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", | "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", | ||||
"10", "11", "12", "13", "14", "15", "16", "17", "18" | |||||
"10", "11", "12", "13", "14", "15", "16", "17", "18", "19" | |||||
}; | }; | ||||
static final String[] COMPLIANCE_INPUTS = new String[] { | static final String[] COMPLIANCE_INPUTS = new String[] { | ||||
"-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "-1.9", "-9", | "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "-1.9", "-9", | ||||
"-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18" | |||||
"-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17", "-18", "-19" | |||||
}; | }; | ||||
private static final ICommandEditor COMMAND_EDITOR; | private static final ICommandEditor COMMAND_EDITOR; |
return 19 <= vmVersion; | return 19 <= vmVersion; | ||||
} | } | ||||
public static boolean is20VMOrGreater() { | |||||
return 20 <= vmVersion; | |||||
} | |||||
/** | /** | ||||
* Shorthand for "if null, throw IllegalArgumentException" | * Shorthand for "if null, throw IllegalArgumentException" | ||||
* | * |