From 9624c3f6012e79dfab7a2927d97252ffa5719274 Mon Sep 17 00:00:00 2001 From: Andrey Li Date: Thu, 6 Jun 2019 12:21:06 -0700 Subject: [PATCH 1/2] Revert okhttp bump to 3.12.0 --- app/build.gradle | 5 ----- gradle/dependencies.gradle | 2 +- libtelemetry/build.gradle | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cff25a6ee..e0e439152 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,11 +18,6 @@ android { } } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - flavorDimensions "version" productFlavors { full { diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 6a5602a34..71305e039 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -13,7 +13,7 @@ ext { constraintLayout : '1.0.2', mockito : '2.11.0', testRunnerVersion : '1.0.1', - okhttp3 : '3.14.1', + okhttp3 : '3.12.0', gson : '2.8.5', espressoVersion : '3.0.1', archLifecycleVersion: "1.1.0", diff --git a/libtelemetry/build.gradle b/libtelemetry/build.gradle index 931617990..17ca8b1dc 100644 --- a/libtelemetry/build.gradle +++ b/libtelemetry/build.gradle @@ -29,8 +29,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 } flavorDimensions "version" From 5878516d47f1b6d797b589755cd372039d100915 Mon Sep 17 00:00:00 2001 From: Andrey Li Date: Thu, 6 Jun 2019 12:22:53 -0700 Subject: [PATCH 2/2] Update gradle plugin --- gradle/dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 71305e039..dceee0850 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -23,7 +23,7 @@ ext { pluginVersion = [ checkstyle : '8.4', - gradle : '3.3.0', + gradle : '3.4.1', dependencyGraph: '0.5.0' ] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69dafe393..014700299 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 18 15:07:23 CET 2019 +#Thu Jun 06 12:04:38 PDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip