First Java 19 version, barely tested.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java
index 1a82cb6a019abe75f5e048727a8959eea56c6643..53fb5750c5897c336c9221f060b5eb78f14b3a16 100644 (file)
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildNotifier.java
@@ -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)

diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
index 6435903c8db8e3f9efa29b930eff386bc41945e3..f352a76907d544e8f2267d86e70244ab648d6ed7 100644 (file)
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
@@ -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) {

diff --git a/pom.xml b/pom.xml
index 07777058ce0682f7048047f00b646338e1fa0a58..41805cbf8ea590211cc62f69a29950618462203d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>

diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
index 650fdc4e5825319120e8eb8e4db465e280175f66..dc83ed7fabc99f10af4b2291314b0f17e78dedb6 100644 (file)
--- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -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;

diff --git a/util/src/main/java/org/aspectj/util/LangUtil.java b/util/src/main/java/org/aspectj/util/LangUtil.java
index d916002b69e3f574a9b4e280442fb97fdc5b6ebf..944e95040ddbe30157540605d0d8e39e08341b0d 100644 (file)
--- a/util/src/main/java/org/aspectj/util/LangUtil.java
+++ b/util/src/main/java/org/aspectj/util/LangUtil.java
@@ -182,6 +182,10 @@ public class LangUtil {
                return 19 <= vmVersion;
        }
 
+       public static boolean is20VMOrGreater() {
+               return 20 <= vmVersion;
+       }
+
        /**
         * Shorthand for "if null, throw IllegalArgumentException"
         *