Polish code in preparation for a Groovy upgrade #9627
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lptr
reviewed
Jun 5, 2019
subprojects/launcher/src/test/groovy/org/gradle/launcher/MainTest.groovy
Show resolved
Hide resolved
lptr
reviewed
Jun 5, 2019
subprojects/docs/src/samples/userguide/mavenMigration/basic/kotlin/build.gradle.kts
Outdated
Show resolved
Hide resolved
l0rinc
force-pushed
the
lorinc/groovy-upgrade-257
branch
2 times, most recently
from
e396c06
to
83d9dcf
Compare
l0rinc
commented
Jun 8, 2019
|
|
||
| final inputFingerprinter = new AbsolutePathFileCollectionFingerprinter( | ||
| new DefaultFileSystemSnapshotter( | ||
| fileHasher, |
There was a problem hiding this comment.
Trait references to other fields aren't atomic and see their values as null
May be a bug, opened: https://issues.apache.org/jira/browse/GROOVY-9167
l0rinc
force-pushed
the
lorinc/groovy-upgrade-257
branch
from
83d9dcf
to
7f23609
Compare
l0rinc
changed the title
l0rinc
commented
Jun 8, 2019
...Test/groovy/org/gradle/java/compile/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy
Show resolved
Hide resolved
l0rinc
commented
Jun 8, 2019
...Test/groovy/org/gradle/java/compile/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy
Show resolved
Hide resolved
l0rinc
force-pushed
the
lorinc/groovy-upgrade-257
branch
from
858a231
to
1805e0d
Compare
l0rinc
commented
Jun 9, 2019
...nt/src/test/groovy/org/gradle/api/internal/artifacts/transform/TransformationNodeSpec.groovy
Show resolved
Hide resolved
l0rinc
force-pushed
the
lorinc/groovy-upgrade-257
branch
from
1805e0d
to
b37b04e
Compare
l0rinc
force-pushed
the
lorinc/groovy-upgrade-257
branch
3 times, most recently
from
3661059
to
280f97e
Compare
l0rinc
commented
Jun 11, 2019
| @@ -30,8 +30,8 @@ class RebaselinePerformanceTests extends SourceTask { | |||
|
|
|||
| @TaskAction | |||
| void rebaseline() { | |||
| getSource().each { file -> | |||
| file.text = rebaseline(file.text, baseline) | |||
| for (file in getSource()) { | |||
There was a problem hiding this comment.
l0rinc
changed the title
l0rinc
force-pushed
the
lorinc/groovy-upgrade-257
branch
from
280f97e
to
f75fd41
Compare
l0rinc
changed the title
wolfs
requested changes
Jul 24, 2019
...subprojects/performance/src/main/groovy/org/gradle/testing/RebaselinePerformanceTests.groovy
Outdated
Show resolved
Hide resolved
...ntegTest/groovy/org/gradle/java/compile/AbstractGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
...ntegTest/groovy/org/gradle/java/compile/AbstractGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
For some reason Groovy 2.5.7 is stricter WRT the order of declared mock expectations for this particular test. Changing the order to accurately reflect the true invocation order allows this test to pass with Groovy 2.5.4 and 2.5.7
…ed Groovy/Java avoidance suite
l0rinc
force-pushed
the
lorinc/groovy-upgrade-257
branch
from
f75fd41
to
f7cef6b
Compare
|
Force pushed to remove invalid commits |
wolfs
reviewed
Jul 25, 2019
...ntegTest/groovy/org/gradle/java/compile/AbstractGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
...ntegTest/groovy/org/gradle/java/compile/AbstractGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
...Test/groovy/org/gradle/java/compile/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
...Test/groovy/org/gradle/java/compile/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
...Test/groovy/org/gradle/java/compile/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy
Show resolved
Hide resolved
wolfs
requested changes
Jul 25, 2019
...Test/groovy/org/gradle/java/compile/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
...Test/groovy/org/gradle/java/compile/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy
Outdated
Show resolved
Hide resolved
…le/AbstractJavaGroovyCompileAvoidanceIntegrationSpec.groovy Co-Authored-By: Stefan Wolf <wolf@gradle.com>
wolfs
approved these changes
Jul 25, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A step towards #8681
This PR doesn't change the Groovy version anymore, it just fixes a few quirks that would fail with 2.5.7
See:
Groovy bugs reported: