You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2018/08/01 16:05:07 UTC
[geode] branch develop updated: GEODE-5508: Fix encoding build
errors on Windows (#2235)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 1554e6f GEODE-5508: Fix encoding build errors on Windows (#2235)
1554e6f is described below
commit 1554e6fe013e25bf448a565ed601b36e859b6c90
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Aug 1 09:04:58 2018 -0700
GEODE-5508: Fix encoding build errors on Windows (#2235)
---
gradle/java.gradle | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/gradle/java.gradle b/gradle/java.gradle
index d023a3f..64b464d 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -29,7 +29,7 @@ subprojects {
if (javaVersion.startsWith("1.8.0") && javaVersion.split("_")[1].toInteger() < 121) {
throw new GradleException("Java version 1.8.0_121 or later required, but was " + javaVersion)
}
-
+
configurations {
testOutput {
@@ -62,20 +62,20 @@ subprojects {
options.encoding = 'UTF-8'
classpath += configurations.compileOnly
}
-}
// apply compiler options
-gradle.taskGraph.whenReady({ graph ->
- tasks.withType(JavaCompile).each { javac ->
- javac.configure {
- sourceCompatibility '1.8'
- targetCompatibility '1.8'
- options.encoding = 'UTF-8'
+ gradle.taskGraph.whenReady({ graph ->
+ tasks.withType(JavaCompile).each { javac ->
+ javac.configure {
+ sourceCompatibility '1.8'
+ targetCompatibility '1.8'
+ options.encoding = 'UTF-8'
+ }
+ javac.options.incremental = true
+ javac.options.fork = true
}
- javac.options.incremental = true
- javac.options.fork = true
- }
-})
+ })
+}
// apply default manifest
gradle.taskGraph.whenReady({ graph ->