Spock can be compiled on JDK 10 [WIP] #862

MartyIX · 2018-07-27T15:20:20Z

Hi,

I did some work on #808 and I can compile Spock with JDK 10. There are several important things though:

Tapestry 5 is not ready for JDK9+ (https://issues.apache.org/jira/projects/TAP5/issues/TAP5-2588)
Compilation on JDK 11+ fails due to Requirement for Java 11 compatibility #843 (see Feature/proxy based mock factory for jdk11 [WIP] #865)

Regards,
Martin

codecov · 2018-07-27T15:38:11Z

Codecov Report

Merging #862 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master     #862      +/-   ##
============================================
+ Coverage        75%   75.01%   +<.01%     
  Complexity     3422     3422              
============================================
  Files           368      368              
  Lines         10528    10545      +17     
  Branches       1323     1331       +8     
============================================
+ Hits           7897     7910      +13     
- Misses         2166     2169       +3     
- Partials        465      466       +1

Impacted Files	Coverage Δ	Complexity Δ
...ckframework/spring/mock/DelegatingInterceptor.java	`52.5% <0%> (-5%)`	`6% <0%> (-1%)`
.../spockframework/mock/runtime/MockInstantiator.java	`58.33% <0%> (-1.67%)`	`5% <0%> (ø)`
...ck/runtime/DynamicProxyMockInterceptorAdapter.java	`100% <0%> (ø)`	`4% <0%> (ø)`	⬇️
...org/spockframework/compiler/ConditionRewriter.java	`54.49% <0%> (+0.05%)`	`44% <0%> (ø)`	⬇️
...spockframework/runtime/ExpressionInfoRenderer.java	`92.85% <0%> (+0.12%)`	`20% <0%> (ø)`	⬇️
...n/java/org/spockframework/util/ReflectionUtil.java	`78.81% <0%> (+0.18%)`	`66% <0%> (ø)`	⬇️
.../java/org/spockframework/runtime/SpockRuntime.java	`71.73% <0%> (+0.31%)`	`20% <0%> (ø)`	⬇️
...pockframework/mock/runtime/InteractionBuilder.java	`80.28% <0%> (+0.86%)`	`26% <0%> (ø)`	⬇️
.../spockframework/builder/CollectionSlotFactory.java	`88.88% <0%> (+1.38%)`	`6% <0%> (ø)`	⬇️
.../spockframework/util/StringMessagePrintStream.java	`86.15% <0%> (+3.07%)`	`24% <0%> (+1%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update eeb1e14...644aeb0. Read the comment docs.

MartyIX · 2018-08-24T15:17:12Z

@leonard84 Hi Leonard, could you please give me some feedback for the PR?

PS: https://travis-ci.org/spockframework/spock/builds/420159380 - best build so far

leonard84 · 2018-08-27T12:22:53Z

spock-specs/src/test/groovy/org/spockframework/EmbeddedSpecification.groovy

+    def trace
+
+    if (javaVersion >= 9) {
+      trace = Arrays.stream(exception.getStackTrace())


can be done with groovy functions without requiring Java8

leonard84 · 2018-08-27T12:23:28Z

settings.gradle

@@ -5,7 +5,7 @@ include "spock-spring"
 include "spock-spring:spring2-test"
 include "spock-spring:spring3-test"
 include "spock-guice"
-include "spock-tapestry"
+// include "spock-tapestry"


only if javaVersion >1.8

leonard84 · 2018-08-27T12:24:06Z

build.gradle

    tasks.withType(Javadoc) {
+      //options.addStringOption('-release', releaseVersion)


what about this?

leonard84 · 2018-08-27T12:24:57Z

build.gradle

  maxGroovyVersion = snapshotVersion ? "3.9.99" : "2.9.99" // TODO lock these down once Groovy 3 gets close to RC stage
  if (System.getProperty("groovyVersion")) {
    groovyVersion = System.getProperty("groovyVersion")
  }
  fullVersion = baseVersion + ((!snapshotVersion && releaseCandidate) ? "-RC$releaseCandidate" : "") + "-groovy-$variant" + (snapshotVersion ? "-SNAPSHOT" : '')
  variantLessVersion = baseVersion + (snapshotVersion ? "-SNAPSHOT" : (releaseCandidate ? "-RC$releaseCandidate" : ""))
-  javaVersions = [1.7, 1.8]
+  javaVersions = [1.8, 9, 10, 11]


Spock 1.x should still support Java 7, it should work if you add it back in

leonard84 · 2018-08-27T12:25:27Z

build.gradle

@@ -33,24 +35,32 @@ ext {
      "org.codehaus.groovy:groovy-test:${groovyVersion}",
      "org.codehaus.groovy:groovy-sql:${groovyVersion}",
      "org.codehaus.groovy:groovy-xml:${groovyVersion}",
+      "org.codehaus.groovy:groovy-jaxb:${groovyVersion}",


why do we need jaxb?

MartyIX · 2018-08-27T18:00:33Z

@leonard84 I have cleaned up the commit as much as I could.

szpak · 2018-08-27T20:01:24Z

build.gradle

+  if (javaVersion >= 9) {
+    groovyDependency += ["javax.xml.bind:jaxb-api:2.3.0"]
+  }
+
  libs = [
    jetbrainsAnnotations: "org.jetbrains:annotations:13.0",
    ant: "org.apache.ant:ant:1.9.7",
    asm: "org.ow2.asm:asm:6.2",
    bytebuddy: "net.bytebuddy:byte-buddy:1.8.3",


There are still new fixed/features related to Java 11 compatibility in byte-buddy. I propose to upgrade it to the least stable version - 1.8.18.

I have tried locally 1.8.17 and some tests fail. I don't believe it is possible due to raphw/byte-buddy#486

Personally, I would rather make this PR work and then somebody can improve it further and add support for Java 11 (#843). To be honest, I don't anything about the stuff mentioned in #843.

Sounds reasonably having the build failing with the newer version. Thanks for trying to keep Spock building on Java 10!

leonard84 · 2018-08-28T07:58:57Z

.travis.yml

@@ -20,6 +20,8 @@ dist: precise # downgrade to avoid jdk7 SSL Bug https://github.com/docker-librar
 jdk:
  - oraclejdk7 # openjdk7 has SSL Bug avoid jdk7 SSL Bug https://github.com/docker-library/openjdk/issues/117
  - oraclejdk8
+  - openjdk9


Java 9 is already eol, the build on travis was green, so I'd say we drop it

leonard84 · 2018-08-28T09:54:25Z

Thanks for your contribution @MartyIX

szpak · 2018-09-08T16:22:36Z

build.gradle

  } else if (variant == 2.5) {
    groovyVersion = "2.5.2"
-    minGroovyVersion = "2.5.0"
+    minGroovyVersion = "2.5.2"


@MartyIX Was it really needed for Java 10 compatibility or you changed in accidentally (and 2.5.0 is still fine)?

@szpak I think I've upgraded the dependency because of this issue https://issues.apache.org/jira/browse/GROOVY-8710. You can certainly try to downgrade it and see if it still works.

MartyIX force-pushed the feature/compile-on-jdk10 branch from 6d78da7 to da6951e Compare July 27, 2018 15:25

MartyIX mentioned this pull request Jul 27, 2018

Requirement for Java 11 compatibility #843

Closed

MartyIX force-pushed the feature/compile-on-jdk10 branch from da6951e to f1fd684 Compare July 27, 2018 15:38

MartyIX force-pushed the feature/compile-on-jdk10 branch 4 times, most recently from e435c1c to 240a2bc Compare August 24, 2018 13:44

MartyIX force-pushed the feature/compile-on-jdk10 branch from 1d34ca6 to 6ad6bde Compare August 26, 2018 19:07

leonard84 requested changes Aug 27, 2018

View reviewed changes

MartyIX force-pushed the feature/compile-on-jdk10 branch from 2e61416 to d50ca96 Compare August 27, 2018 17:29

Spock can be compiled on JDK 10 [WIP]

abe0c37

MartyIX force-pushed the feature/compile-on-jdk10 branch from e2b2502 to abe0c37 Compare August 27, 2018 17:56

szpak reviewed Aug 27, 2018

View reviewed changes

leonard84 requested changes Aug 28, 2018

View reviewed changes

WIP

644aeb0

leonard84 approved these changes Aug 28, 2018

View reviewed changes

leonard84 merged commit a962d8c into spockframework:master Aug 28, 2018

szpak reviewed Sep 8, 2018

View reviewed changes

MartyIX deleted the feature/compile-on-jdk10 branch September 10, 2018 12:58

henrik242 mentioned this pull request Sep 12, 2018

Set groovy minVersion to 2.5.0 #905

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spock can be compiled on JDK 10 [WIP] #862

Spock can be compiled on JDK 10 [WIP] #862

MartyIX commented Jul 27, 2018 •

edited

Loading

codecov bot commented Jul 27, 2018 •

edited

Loading

MartyIX commented Aug 24, 2018

leonard84 Aug 27, 2018

MartyIX Aug 27, 2018

leonard84 Aug 27, 2018

MartyIX Aug 27, 2018 •

edited

Loading

leonard84 Aug 27, 2018

MartyIX Aug 27, 2018

leonard84 Aug 27, 2018

MartyIX Aug 27, 2018

leonard84 Aug 27, 2018

MartyIX Aug 27, 2018

MartyIX commented Aug 27, 2018

szpak Aug 27, 2018

MartyIX Aug 27, 2018

szpak Aug 27, 2018 •

edited

Loading

leonard84 Aug 28, 2018

MartyIX Aug 28, 2018

leonard84 commented Aug 28, 2018

szpak Sep 8, 2018

MartyIX Sep 8, 2018

		tasks.withType(Javadoc) {
		//options.addStringOption('-release', releaseVersion)

Spock can be compiled on JDK 10 [WIP] #862

Spock can be compiled on JDK 10 [WIP] #862

Conversation

MartyIX commented Jul 27, 2018 • edited Loading

codecov bot commented Jul 27, 2018 • edited Loading

Codecov Report

MartyIX commented Aug 24, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MartyIX Aug 27, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MartyIX commented Aug 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

szpak Aug 27, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

leonard84 commented Aug 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MartyIX commented Jul 27, 2018 •

edited

Loading

codecov bot commented Jul 27, 2018 •

edited

Loading

MartyIX Aug 27, 2018 •

edited

Loading

szpak Aug 27, 2018 •

edited

Loading