[Java] Revert.

Author: mjpt777

build.gradle

@@ -30,7 +30,6 @@ defaultTasks 'clean', 'build', 'shadowJar', 'install'
 def sbeGroup = 'uk.co.real-logic'
 def sbeVersion = file('version.txt').text.trim()
 def sbeJavaVersion = JavaVersion.VERSION_1_8
-def sbeJavaReleaseVersion = '8'
 
 group = sbeGroup
 version = sbeVersion
@@ -139,25 +138,15 @@ subprojects {
  checkstyle.toolVersion = '8.25'
 
  compileJava {
- if (JavaVersion.current().ordinal() >= JavaVersion.VERSION_1_9.ordinal()) {
- options.compilerArgs.addAll(['--release', sbeJavaReleaseVersion])
- }
- else {
- sourceCompatibility = sbeJavaVersion
- targetCompatibility = sbeJavaVersion
- }
+ sourceCompatibility = sbeJavaVersion
+ targetCompatibility = sbeJavaVersion
  options.encoding = 'UTF-8'
  options.deprecation = true
  }
 
  compileTestJava {
- if (JavaVersion.current().ordinal() >= JavaVersion.VERSION_1_9.ordinal()) {
- options.compilerArgs.addAll(['--release', sbeJavaReleaseVersion])
- }
- else {
- sourceCompatibility = sbeJavaVersion
- targetCompatibility = sbeJavaVersion
- }
+ sourceCompatibility = sbeJavaVersion
+ targetCompatibility = sbeJavaVersion
  options.encoding = 'UTF-8'
  options.deprecation = true
  }
@@ -217,13 +206,8 @@ project(':sbe-tool') {
 
  compileGeneratedJava {
  dependsOn 'generateCodecs'
- if (JavaVersion.current().ordinal() >= JavaVersion.VERSION_1_9.ordinal()) {
- options.compilerArgs.addAll(['--release', sbeJavaReleaseVersion])
- }
- else {
- sourceCompatibility = sbeJavaVersion
- targetCompatibility = sbeJavaVersion
- }
+ sourceCompatibility = sbeJavaVersion
+ targetCompatibility = sbeJavaVersion
  options.encoding = 'UTF-8'
  options.deprecation = true
  classpath += sourceSets.main.runtimeClasspath
@@ -381,13 +365,8 @@ project(':sbe-samples') {
 
  compileGeneratedJava {
  dependsOn 'generateCodecs'
- if (JavaVersion.current().ordinal() >= JavaVersion.VERSION_1_9.ordinal()) {
- options.compilerArgs.addAll(['--release', sbeJavaReleaseVersion])
- }
- else {
- sourceCompatibility = sbeJavaVersion
- targetCompatibility = sbeJavaVersion
- }
+ sourceCompatibility = sbeJavaVersion
+ targetCompatibility = sbeJavaVersion
  options.encoding = 'UTF-8'
  options.deprecation = true
  classpath += project(':sbe-all').sourceSets.main.runtimeClasspath
@@ -482,13 +461,8 @@ project(':sbe-benchmarks') {
 
  compileGeneratedJava {
  dependsOn 'generateCodecs'
- if (JavaVersion.current().ordinal() >= JavaVersion.VERSION_1_9.ordinal()) {
- options.compilerArgs.addAll(['--release', sbeJavaReleaseVersion])
- }
- else {
- sourceCompatibility = sbeJavaVersion
- targetCompatibility = sbeJavaVersion
- }
+ sourceCompatibility = sbeJavaVersion
+ targetCompatibility = sbeJavaVersion
  options.encoding = 'UTF-8'
  options.deprecation = true
  classpath += project(':sbe-all').sourceSets.main.runtimeClasspath