Skip to content

java 25 ready #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renat-nosto merged 1 commit into from
Jan 7, 2026
Merged

java 25 ready #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion framework/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
}

group 'com.nosto.play'
version '1.8.0-nosto-GA-12'
version '1.8.0-nosto-GA-13'

java {
withSourcesJar()
Expand Down Expand Up @@ -112,10 +112,32 @@ tasks.named('sourcesJar', Jar) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}

task markVersion() {
outputs.upToDateWhen { false }
file("build/assemble/main/play").mkdirs()
file("build/assemble/main/play/version").text = "${project.version}\n"
file("build/assemble/main/play/.keep").text = ""
}

task assembleRunscripts(type: Zip) {
dependsOn assemble, markVersion
archiveBaseName = 'play'
description "Assemble archive $archiveBaseName"
// command
from("../play")
// version
from("build/assemble/main/play/version") {
into("framework/src/play")
}
// lib folder compatibility
from("build/assemble/main/play/.keep") {
into("framework/lib")
}
// jar
from("build/libs/framework-${project.version}.jar") {
into("framework")
rename("framework-", "play-")
}
from("pym") {
into("framework/pym")
}
Expand Down
8 changes: 4 additions & 4 deletions framework/dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ require: &allDependencies
- org.bouncycastle -> bcprov-jdk18on 1.78.1
- org.bouncycastle -> bcpkix-jdk18on 1.78.1
- org.bouncycastle -> bcutil-jdk18on 1.78.1
- org.codehaus.groovy -> groovy 3.0.20
- org.codehaus.groovy -> groovy-xml 3.0.20
- org.eclipse.jdt -> org.eclipse.jdt.core 3.36.0
- org.eclipse.jdt -> ecj 3.36.0
- org.codehaus.groovy -> groovy 3.0.25
- org.codehaus.groovy -> groovy-xml 3.0.25
- org.eclipse.jdt -> org.eclipse.jdt.core 3.44.0
- org.eclipse.jdt -> ecj 3.44.0
- net.bytebuddy -> byte-buddy 1.14.19
- io.smallrye -> jandex 3.1.6
- org.jboss.logging -> jboss-logging 3.5.3.Final
Expand Down
Binary file removed framework/lib/ecj-3.36.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added framework/lib/ecj-3.44.0.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed framework/lib/groovy-3.0.20.jar → framework/lib/groovy-3.0.25.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed framework/lib/groovy-xml-3.0.20.jar → framework/lib/groovy-xml-3.0.25.jar
View file
Open in desktop
Binary file not shown.
Binary file removed framework/lib/org.eclipse.jdt.core-3.36.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added framework/lib/org.eclipse.jdt.core-3.44.0.jar
View file
Open in desktop
Binary file not shown.
15 changes: 13 additions & 2 deletions framework/src/play/classloading/ApplicationCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;

import play.Logger;
Expand All @@ -46,7 +48,11 @@ public class ApplicationCompiler {
Map.entry("18", CompilerOptions.VERSION_18),
Map.entry("19", CompilerOptions.VERSION_19),
Map.entry("20", CompilerOptions.VERSION_20),
Map.entry("21", CompilerOptions.VERSION_21)
Map.entry("21", CompilerOptions.VERSION_21),
Map.entry("22", CompilerOptions.VERSION_22),
Map.entry("23", CompilerOptions.VERSION_23),
Map.entry("24", CompilerOptions.VERSION_24),
Map.entry("25", CompilerOptions.VERSION_25)
);

final Map<String, Boolean> packagesCache = new HashMap<>();
Expand Down Expand Up @@ -142,6 +148,11 @@ public char[][] getPackageName() {
public boolean ignoreOptionalProblems() {
return false;
}

@Override
public ModuleBinding module(LookupEnvironment environment) {
return environment.UnNamedModule;
}
}

/**
Expand Down Expand Up @@ -307,7 +318,7 @@ public void cleanup() {
/**
* The JDT compiler
*/
Compiler jdtCompiler = new Compiler(nameEnvironment, policy, settings, compilerRequestor, problemFactory) {
Compiler jdtCompiler = new Compiler(nameEnvironment, policy, new CompilerOptions(settings), compilerRequestor, problemFactory) {

@Override
protected void handleInternalException(Throwable e, CompilationUnitDeclaration ud, CompilationResult result) {
Expand Down