Browse Source

First Java 19 version, barely tested.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
tags/V1_9_19
Alexander Kriegisch 1 year ago
parent
commit
c540b0f60e

+ 4
- 3
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java View File

@@ -11,10 +11,11 @@
package org.aspectj.ajdt.internal.core.builder;

import org.aspectj.bridge.IProgressListener;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
import org.aspectj.org.eclipse.jdt.internal.core.builder.BuildNotifier;

import java.util.function.BooleanSupplier;

/**
* @author colyer
*
@@ -26,8 +27,8 @@ public class AjBuildNotifier extends BuildNotifier implements IProgressListener
* @param monitor
* @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)

+ 3
- 2
org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java View File

@@ -16,6 +16,7 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.function.BooleanSupplier;

import org.aspectj.ajdt.core.AspectJCore;
import org.aspectj.ajdt.internal.compiler.CompilerAdapter;
@@ -149,8 +150,8 @@ public class AspectJBuilder extends JavaBuilder implements ICompilerAdapterFacto
* @see org.eclipse.jdt.internal.core.builder.JavaBuilder#createBuildNotifier(org.eclipse.core.runtime.IProgressMonitor,
* 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) {

+ 2
- 2
pom.xml View File

@@ -21,8 +21,8 @@
<maven.javadoc.skip>true</maven.javadoc.skip>

<!-- 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.xerces.version>2.6.2</lib.ant.xerces.version>
<lib.regexp.version>1.2</lib.regexp.version>

+ 3
- 3
taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java View File

@@ -252,15 +252,15 @@ public class AjcTask extends MatchingTask {

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",
"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[] {
"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[] {
"-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;

+ 4
- 0
util/src/main/java/org/aspectj/util/LangUtil.java View File

@@ -182,6 +182,10 @@ public class LangUtil {
return 19 <= vmVersion;
}

public static boolean is20VMOrGreater() {
return 20 <= vmVersion;
}

/**
* Shorthand for "if null, throw IllegalArgumentException"
*

Loading…
Cancel
Save