Skip to content

Commit

Permalink
Merge branch '1.1.x' into 1.3.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
  • Loading branch information
shakuzen committed Dec 3, 2019
2 parents 003dc29 + 18831df commit 9373815
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions build.gradle
Expand Up @@ -34,13 +34,15 @@ subprojects {
tasks {
compileJava {
options.encoding = 'UTF-8'
options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
// ensure Java 8 baseline is enforced for main source
if (JavaVersion.current().isJava9Compatible()) {
options.compilerArgs.addAll(['--release', '8'])
}
}
compileTestJava {
options.encoding = 'UTF-8'
options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
sourceCompatibility = JavaVersion.current()
targetCompatibility = JavaVersion.current()
}
Expand Down

0 comments on commit 9373815

Please sign in to comment.