diff --git a/framework/build.gradle b/framework/build.gradle index f48ea7c144..3480934652 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -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() @@ -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") } diff --git a/framework/dependencies.yml b/framework/dependencies.yml index befcde1eb0..d25fc2e823 100644 --- a/framework/dependencies.yml +++ b/framework/dependencies.yml @@ -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 diff --git a/framework/lib/ecj-3.36.0.jar b/framework/lib/ecj-3.36.0.jar deleted file mode 100644 index 5fe2e5dc71..0000000000 Binary files a/framework/lib/ecj-3.36.0.jar and /dev/null differ diff --git a/framework/lib/ecj-3.44.0.jar b/framework/lib/ecj-3.44.0.jar new file mode 100644 index 0000000000..bc22cd6ec5 Binary files /dev/null and b/framework/lib/ecj-3.44.0.jar differ diff --git a/framework/lib/groovy-3.0.20.jar b/framework/lib/groovy-3.0.25.jar similarity index 83% rename from framework/lib/groovy-3.0.20.jar rename to framework/lib/groovy-3.0.25.jar index d3b704edcf..dfa97405e3 100644 Binary files a/framework/lib/groovy-3.0.20.jar and b/framework/lib/groovy-3.0.25.jar differ diff --git a/framework/lib/groovy-xml-3.0.20.jar b/framework/lib/groovy-xml-3.0.25.jar similarity index 84% rename from framework/lib/groovy-xml-3.0.20.jar rename to framework/lib/groovy-xml-3.0.25.jar index 5e1e17728e..93d48f0c5a 100644 Binary files a/framework/lib/groovy-xml-3.0.20.jar and b/framework/lib/groovy-xml-3.0.25.jar differ diff --git a/framework/lib/org.eclipse.jdt.core-3.36.0.jar b/framework/lib/org.eclipse.jdt.core-3.36.0.jar deleted file mode 100644 index c7a65695a9..0000000000 Binary files a/framework/lib/org.eclipse.jdt.core-3.36.0.jar and /dev/null differ diff --git a/framework/lib/org.eclipse.jdt.core-3.44.0.jar b/framework/lib/org.eclipse.jdt.core-3.44.0.jar new file mode 100644 index 0000000000..fc4a3b0988 Binary files /dev/null and b/framework/lib/org.eclipse.jdt.core-3.44.0.jar differ diff --git a/framework/src/play/classloading/ApplicationCompiler.java b/framework/src/play/classloading/ApplicationCompiler.java index 83d8276284..30d1c2016d 100644 --- a/framework/src/play/classloading/ApplicationCompiler.java +++ b/framework/src/play/classloading/ApplicationCompiler.java @@ -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; @@ -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 packagesCache = new HashMap<>(); @@ -142,6 +148,11 @@ public char[][] getPackageName() { public boolean ignoreOptionalProblems() { return false; } + + @Override + public ModuleBinding module(LookupEnvironment environment) { + return environment.UnNamedModule; + } } /** @@ -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) {