Skip to content
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.

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

Play 1.7.1 #54

Merged
merged 47 commits into from
Oct 18, 2022
Merged

Play 1.7.1 #54

merged 47 commits into from
Oct 18, 2022

Conversation

renat-nosto
Copy link
Member

Pull Request Checklist

Helpful things

Fixes

Fixes #xxxx

Purpose

What does this PR do?

Background Context

Why did you take this approach?

References

Are there any relevant issues / PRs / mailing lists discussions?

tazmaniax and others added 30 commits April 3, 2022 11:18
no initialization playHome
…e_fixes

[playframework#1401] 🐛 Fix python3 incompatibilities in module manipulation code
fixed playframework#1399 "UnboundLocalError: local variable 'playHome' referenced before assignment
…ndency_update_20220403

Third party dependency update 20220403
…e in application root folder

* Restore the old reflection code that completely replace the OUTPUT phase of Groovy compilation unit
* Fix the compilation exception handling that was producing cast error as not checking properly exception type
…ation_fixes

[playframework#1403] 🐛 Fix Groovy compilation unit that tries to write in applicat…
Co-authored-by: Christophe Maillard <christophe@qudini.com>
Do not overwrite system property net.spy.log.LoggerImpl -> 1.7.1
…-java-version-before-startup

update check of java version
* Updated dependencies as of 20220618
* Fixed source formatting
* remove unnecessary checks for null
* remove the use of the deprecated methods and constructors
* use computeIfAbsent() instead of get()/put()
* remove unused constant
* simplify if expression
@@ -56,7 +56,7 @@ public void enhanceThisClass(ApplicationClass applicationClass) throws Exception
parameterNames.add(new T2<>(localVariableAttribute.startPc(i) + localVariableAttribute.index(i), localVariableAttribute.variableName(i)));
}
}
Collections.sort(parameterNames, Comparator.comparing(o -> o._1));
parameterNames.sort(Comparator.comparing(o -> o._1));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this a dead class? (as in, java 7 is explicitly not supported anymore)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im under impression it means 7+

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or not, anyway i'd rather just keep minor details in sync with upstream

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, there's another LocalvariablesNamesEnhancer.java... but I agree with the sync with upstream

@@ -25,6 +25,7 @@ def execute(**kargs):
shutil.copyfile(os.path.join(play_env["basedir"], 'resources/idea/imlTemplate.xml'), imlFile)
cpXML = ""

playHome = play_env["basedir"].replace('\\', '/')
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix for play idealize

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh! is that it? interesting

Comment on lines +149 to +160
// Play needs to handle writing the generated Groovy class to the file system but the Groovy
// compilation unit by default adds it's own output phase operation to do this that cannot
// be replaced using the available public methods. Until Groovy provides this capability
// it's necessary to access the compilation unit directly using reflection to replace the
// default output operation with the Play Groovy class handler.
Field phasesF = compilationUnit.getClass().getDeclaredField("phaseOperations");
phasesF.setAccessible(true);
Collection[] phases = (Collection[]) phasesF.get(compilationUnit);
LinkedList<IGroovyClassOperation> output = new LinkedList<>();
phases[Phases.OUTPUT] = output;
output.add(groovyClassesForThisTemplate::add);

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert to old way of handling templates to prevent spamming

Copy link

@leandroutn leandroutn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me 👍🏼

@renat-nosto renat-nosto merged commit fd4cff0 into master Oct 18, 2022
@renat-nosto renat-nosto deleted the play_1.7.1 branch March 27, 2024 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants