Skip to content

Commit

Permalink
all: Swap to Java 7 source and bytecode
Browse files Browse the repository at this point in the history
Core and OkHttp are left with Java 6 for the moment. Once we resolve
their issues they could be bumped as well.

Updates grpc#3961
  • Loading branch information
ejona86 committed Aug 27, 2018
1 parent b8f4c7a commit cc66a97
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ subprojects {
group = "io.grpc"
version = "1.15.0-SNAPSHOT" // CURRENT_GRPC_VERSION

sourceCompatibility = 1.6
targetCompatibility = 1.6
sourceCompatibility = 1.7
targetCompatibility = 1.7

repositories {
maven { // The google mirror is less flaky than mavenCentral()
Expand Down
6 changes: 6 additions & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
description = 'gRPC: Core'

// Workaround:
// [Undefined reference (android-api-level-14-4.0_r4)] io.grpc.internal.(Rescheduler.java:87)
// >> Object java.util.Objects.requireNonNull(Object)
sourceCompatibility = 1.6
targetCompatibility = 1.6

dependencies {
compile project(':grpc-context'),
libraries.gson,
Expand Down
4 changes: 2 additions & 2 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<protoc.version>3.5.1-1</protoc.version>
<netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
<!-- required for jdk9 -->
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<dependencies>
<dependency>
Expand Down
7 changes: 7 additions & 0 deletions okhttp/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
description = "gRPC: OkHttp"

// Workaround:
// Util.java:219: warning: [unchecked] Possible heap pollution from parameterized vararg type T
// Need to verify the @SafeVarargs annotation is safe for Android
sourceCompatibility = 1.6
targetCompatibility = 1.6

dependencies {
compile project(':grpc-core'),
libraries.okhttp,
Expand Down

0 comments on commit cc66a97

Please sign in to comment.