.

Author: ouertani

build.gradle

@@ -10,7 +10,23 @@ allprojects {
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile) {
             options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+<<<<<<< HEAD
             options.encoding = 'UTF-8'
+=======
+            options.encoding = 'UTF-8'           
+        }
+        
+        tasks.withType(Javadoc) {
+            source = sourceSets.main.allJava          
+           
+            configure(options) {  
+                encoding 'UTF-8'
+                docEncoding 'UTF-8'
+                charSet 'UTF-8'
+                linkSource true 
+                noTimestamp true               
+            }
+>>>>>>> 30c2b95d5bf72c6e57030924d3179920257f96d2
         }
     }
 
@@ -52,6 +68,7 @@ allprojects {
 
 
 subprojects {
+<<<<<<< HEAD
   apply plugin: 'java'
   sourceCompatibility = 1.6
   targetCompatibility = 1.6
@@ -71,5 +88,20 @@ subprojects {
 project(':reactive-streams-tck') {    
     dependencies {
         compile project(':reactive-streams-api')
+=======
+    apply plugin: 'java'
+    sourceCompatibility = 1.6
+    targetCompatibility = 1.6
+
+    compileJava.options.encoding = 'UTF-8'
+
+    javadoc {
+        destinationDir = file("build/docs/java/api")
+        options.encoding = 'UTF-8'
+    }
+    repositories {
+        mavenLocal()
+        mavenCentral()
+>>>>>>> 30c2b95d5bf72c6e57030924d3179920257f96d2
     }
 }