Skip to content

[SPARK-12000] Fixes compilation issues with java8 and sbt. #10048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thunterdb wants to merge 2 commits into from
Closed

[SPARK-12000] Fixes compilation issues with java8 and sbt. #10048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97d12f1
changes
thunterdb Nov 26, 2015
9900539
comments
thunterdb Nov 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions network/common/src/main/java/org/apache/spark/network/client/StreamCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import java.nio.ByteBuffer;

/**
* Callback for streaming data. Stream data will be offered to the {@link onData(ByteBuffer)}
* method as it arrives. Once all the stream data is received, {@link onComplete()} will be
* Callback for streaming data. Stream data will be offered to the {@link onData(String, ByteBuffer)}
* method as it arrives. Once all the stream data is received, {@link onComplete(String)} will be
* called.
* <p>
* The network library guarantees that a single thread will call these methods at a time, but
Expand Down
2 changes: 1 addition & 1 deletion network/common/src/main/java/org/apache/spark/network/server/RpcHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public abstract void receive(

/**
* Receives an RPC message that does not expect a reply. The default implementation will
* call "{@link receive(TransportClient, byte[], RpcResponseCallback}" and log a warning if
* call "{@link receive(TransportClient, byte[], RpcResponseCallback)}" and log a warning if
* any of the callback methods are called.
*
* @param client A channel client which enables the handler to make requests back to the sender
Expand Down
8 changes: 5 additions & 3 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,15 @@ object SparkBuild extends PomBuild {
if (major.toInt >= 1 && minor.toInt >= 8) Seq("-Xdoclint:all", "-Xdoclint:-missing") else Seq.empty
},

// TODO(thunterdb) how to set these based on the current version of the JVM?
javacJVMVersion := "1.7",
scalacJVMVersion := "1.7",

javacOptions in Compile ++= Seq(
"-encoding", "UTF-8",
"-source", javacJVMVersion.value,
"-target", javacJVMVersion.value
"-encoding", "UTF-8"
// TODO(thunterdb) make it conditional for <= "1.7"
Copy link
Contributor Author

@thunterdb thunterdb Nov 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure how to get the current version of java (not the target version).

//"-source", javacJVMVersion.value,
//"-target", javacJVMVersion.value
),

scalacOptions in Compile ++= Seq(
Expand Down