From 4deb8818d32e75f2cd070ed2496094fac780b093 Mon Sep 17 00:00:00 2001 From: Ludovic Roland Date: Thu, 2 Nov 2017 14:17:07 +0100 Subject: [PATCH] RED-149 #time 30m Update the okhttp library to Android Studio 3.0. Update the version code and the version name. --- build.gradle | 7 ++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- okhttp/build.gradle | 16 ++++++++-------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 66e7089..fac9cbe 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript dependencies { - classpath "com.android.tools.build:gradle:2.3.3" + classpath "com.android.tools.build:gradle:3.0.0" classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3" } } @@ -19,10 +19,7 @@ allprojects repositories { jcenter() - maven - { - url "https://maven.google.com" - } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3e236a5..36aa90d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon May 15 11:03:57 CEST 2017 +#Thu Nov 02 14:11:34 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/okhttp/build.gradle b/okhttp/build.gradle index dafb601..b7b97e6 100644 --- a/okhttp/build.gradle +++ b/okhttp/build.gradle @@ -5,16 +5,16 @@ apply plugin: "maven-publish" android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 26 + buildToolsVersion "26.0.2" defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 26 - versionCode 11 - versionName "1.0.1.003-SNAPSHOT" + versionCode 12 + versionName "1.0.1" } buildTypes @@ -31,11 +31,11 @@ android dependencies { //Smart&Soft - compile ("com.smartnsoft:droid4me:2.5.3") - compile ("com.smartnsoft:droid4me.ext:2.5.3") + implementation ("com.smartnsoft:droid4me:2.5.3") + implementation ("com.smartnsoft:droid4me.ext:2.5.3") //Third party libraries - compile ("com.squareup.okhttp3:okhttp:3.8.0") + api ("com.squareup.okhttp3:okhttp:3.8.0") } task sourcesJar(type: Jar) {