mirror of https://github.com/grpc/grpc-java.git
all: Swap to Java 7 source and bytecode
Core and OkHttp are left with Java 6 for the moment. Once we resolve their issues they could be bumped as well. Updates #3961
This commit is contained in:
parent
8d6ba2335a
commit
7b126b00a0
|
|
@ -55,8 +55,8 @@ subprojects {
|
||||||
group = "io.grpc"
|
group = "io.grpc"
|
||||||
version = "1.15.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
version = "1.15.0-SNAPSHOT" // CURRENT_GRPC_VERSION
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
sourceCompatibility = 1.7
|
||||||
targetCompatibility = 1.6
|
targetCompatibility = 1.7
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { // The google mirror is less flaky than mavenCentral()
|
maven { // The google mirror is less flaky than mavenCentral()
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,11 @@
|
||||||
description = 'gRPC: Core'
|
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 {
|
dependencies {
|
||||||
compile project(':grpc-context'),
|
compile project(':grpc-context'),
|
||||||
libraries.gson,
|
libraries.gson,
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,8 @@
|
||||||
<protoc.version>3.5.1-1</protoc.version>
|
<protoc.version>3.5.1-1</protoc.version>
|
||||||
<netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
|
<netty.tcnative.version>2.0.7.Final</netty.tcnative.version>
|
||||||
<!-- required for jdk9 -->
|
<!-- required for jdk9 -->
|
||||||
<maven.compiler.source>1.6</maven.compiler.source>
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
<maven.compiler.target>1.6</maven.compiler.target>
|
<maven.compiler.target>1.7</maven.compiler.target>
|
||||||
</properties>
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,11 @@
|
||||||
description = "gRPC: OkHttp"
|
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 {
|
dependencies {
|
||||||
compile project(':grpc-core'),
|
compile project(':grpc-core'),
|
||||||
libraries.okhttp,
|
libraries.okhttp,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue