Merge pull request #57 from MinimallyCorrect/dependabot/gradle/com.github.javaparser-javaparser-core-3.23.0

Bump javaparser-core from 3.6.24 to 3.23.0

Author: LunNova

build.gradle.kts

@@ -36,7 +36,7 @@ minimallyCorrectDefaults.configureProject(project)
 
 dependencies {
 	testImplementation("junit:junit:4.13.2")
-	implementation("com.github.javaparser:javaparser-core:3.6.24")
+	implementation("com.github.javaparser:javaparser-core:3.23.0")
 	api("com.google.code.findbugs:jsr305:3.0.2")
 	api("org.jetbrains:annotations:22.0.0")
 

src/main/java/dev/minco/javatransformer/api/AccessFlags.java

@@ -38,65 +38,74 @@ public AccessFlags(@AccessFlagsConstant int access) {
 		this.access = access;
 	}
 
-	public AccessFlags(EnumSet<Modifier> modifiers) {
+	public AccessFlags(Iterable<Modifier> modifiers) {
 		this(accessFor(modifiers));
 	}
 
 	@AccessFlagsConstant
-	private static int accessFor(EnumSet<Modifier> modifiers) {
+	private static int accessFor(Iterable<Modifier> modifiers) {
+		val modifierSet = EnumSet.noneOf(Modifier.Keyword.class);
+		for (Modifier modifier : modifiers) {
+			modifierSet.add(modifier.getKeyword());
+		}
+		return accessFor(modifierSet);
+	}
+
+	@AccessFlagsConstant
+	private static int accessFor(EnumSet<Modifier.Keyword> modifiers) {
 		int access = 0;
-		if (modifiers.contains(Modifier.PUBLIC))
+		if (modifiers.contains(Modifier.Keyword.PUBLIC))
 			access |= ACC_PUBLIC;
-		if (modifiers.contains(Modifier.PRIVATE))
+		if (modifiers.contains(Modifier.Keyword.PRIVATE))
 			access |= ACC_PRIVATE;
-		if (modifiers.contains(Modifier.PROTECTED))
+		if (modifiers.contains(Modifier.Keyword.PROTECTED))
 			access |= ACC_PROTECTED;
-		if (modifiers.contains(Modifier.STATIC))
+		if (modifiers.contains(Modifier.Keyword.STATIC))
 			access |= ACC_STATIC;
-		if (modifiers.contains(Modifier.FINAL))
+		if (modifiers.contains(Modifier.Keyword.FINAL))
 			access |= ACC_FINAL;
-		if (modifiers.contains(Modifier.SYNCHRONIZED))
+		if (modifiers.contains(Modifier.Keyword.SYNCHRONIZED))
 			access |= ACC_SYNCHRONIZED;
-		if (modifiers.contains(Modifier.VOLATILE))
+		if (modifiers.contains(Modifier.Keyword.VOLATILE))
 			access |= ACC_VOLATILE;
-		if (modifiers.contains(Modifier.TRANSIENT))
+		if (modifiers.contains(Modifier.Keyword.TRANSIENT))
 			access |= ACC_TRANSIENT;
-		if (modifiers.contains(Modifier.NATIVE))
+		if (modifiers.contains(Modifier.Keyword.NATIVE))
 			access |= ACC_NATIVE;
-		if (modifiers.contains(Modifier.ABSTRACT))
+		if (modifiers.contains(Modifier.Keyword.ABSTRACT))
 			access |= ACC_ABSTRACT;
-		if (modifiers.contains(Modifier.STRICTFP))
+		if (modifiers.contains(Modifier.Keyword.STRICTFP))
 			access |= ACC_STRICT;
 		return access;
 	}
 
-	public EnumSet<Modifier> toJavaParserModifierSet() {
-		val modifiers = new ArrayList<Modifier>();
+	public Modifier.Keyword[] toJavaParserModifierSet() {
+		val modifiers = new ArrayList<Modifier.Keyword>();
 
 		if (has(ACC_PUBLIC))
-			modifiers.add(Modifier.PUBLIC);
+			modifiers.add(Modifier.Keyword.PUBLIC);
 		if (has(ACC_PRIVATE))
-			modifiers.add(Modifier.PRIVATE);
+			modifiers.add(Modifier.Keyword.PRIVATE);
 		if (has(ACC_PROTECTED))
-			modifiers.add(Modifier.PROTECTED);
+			modifiers.add(Modifier.Keyword.PROTECTED);
 		if (has(ACC_STATIC))
-			modifiers.add(Modifier.STATIC);
+			modifiers.add(Modifier.Keyword.STATIC);
 		if (has(ACC_FINAL))
-			modifiers.add(Modifier.FINAL);
+			modifiers.add(Modifier.Keyword.FINAL);
 		if (has(ACC_SYNCHRONIZED))
-			modifiers.add(Modifier.SYNCHRONIZED);
+			modifiers.add(Modifier.Keyword.SYNCHRONIZED);
 		if (has(ACC_VOLATILE))
-			modifiers.add(Modifier.VOLATILE);
+			modifiers.add(Modifier.Keyword.VOLATILE);
 		if (has(ACC_TRANSIENT))
-			modifiers.add(Modifier.TRANSIENT);
+			modifiers.add(Modifier.Keyword.TRANSIENT);
 		if (has(ACC_NATIVE))
-			modifiers.add(Modifier.NATIVE);
+			modifiers.add(Modifier.Keyword.NATIVE);
 		if (has(ACC_ABSTRACT))
-			modifiers.add(Modifier.ABSTRACT);
+			modifiers.add(Modifier.Keyword.ABSTRACT);
 		if (has(ACC_STRICT))
-			modifiers.add(Modifier.STRICTFP);
+			modifiers.add(Modifier.Keyword.STRICTFP);
 
-		return EnumSet.copyOf(modifiers);
+		return modifiers.toArray(new Modifier.Keyword[0]);
 	}
 
 	@Override

src/main/java/dev/minco/javatransformer/internal/ClassPaths.java

@@ -33,7 +33,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import com.github.javaparser.JavaParser;
+import com.github.javaparser.StaticJavaParser;
 import com.github.javaparser.ast.CompilationUnit;
 
 import dev.minco.javatransformer.api.ClassInfo;
@@ -150,7 +150,7 @@ private void findPaths(String entryName, Supplier<InputStream> iss) {
 		}
 
 		private void findJavaPaths(InputStream is) {
-			val parsed = JavaParser.parse(is);
+			val parsed = StaticJavaParser.parse(is);
 			findJavaPaths(parsed);
 		}