From 11a34e539bbbdac68fe1050a87bbd3d3bdf382d6 Mon Sep 17 00:00:00 2001 From: Chimichanga Date: Tue, 10 Oct 2017 13:34:42 -0300 Subject: [PATCH] Bump versions to API 26 along with libraries bumps (#8) --- build.gradle | 2 ++ networking/build.gradle | 26 +++++++++++++++++--------- networking/proguard-okhttp.pro | 1 + 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 37c41c0..ac34765 100755 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ buildscript { mavenCentral() jcenter() } + dependencies { classpath 'com.android.tools.build:gradle:2.3.1' // NOTE: Do not place your application dependencies here; they belong @@ -18,6 +19,7 @@ allprojects { repositories { jcenter() maven { url "https://jitpack.io" } + maven { url "https://maven.google.com" } flatDir { dirs 'libs' diff --git a/networking/build.gradle b/networking/build.gradle index 9f6cd06..8e68c52 100755 --- a/networking/build.gradle +++ b/networking/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.Wolox' android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 26 + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 26 consumerProguardFiles 'proguard-joda-time.pro', 'proguard-retrofit.pro', 'proguard-okhttp.pro' } @@ -19,17 +19,25 @@ android { } } +buildscript { + ext.wolmo_version = 'v1.2.0' + ext.retrofit_version = '2.3.0' + ext.okhttp3_version = '3.9.0' +} + dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) // Wolmo - compile 'com.github.Wolox:wolmo-core-android:v1.0.0' + compile "com.github.Wolox:wolmo-core-android:$wolmo_version" // Third party - compile 'com.squareup.retrofit2:retrofit:2.2.0' - compile 'com.squareup.retrofit2:converter-gson:2.2.0' - compile 'com.squareup.okhttp3:okhttp-urlconnection:3.7.0' - compile 'com.squareup.okhttp3:okhttp:3.7.0' - compile 'com.squareup.okhttp3:logging-interceptor:3.7.0' + compile "com.squareup.retrofit2:retrofit:$retrofit_version" + compile "com.squareup.retrofit2:converter-gson:$retrofit_version" + + compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttp3_version" + compile "com.squareup.okhttp3:okhttp:$okhttp3_version" + compile "com.squareup.okhttp3:logging-interceptor:$okhttp3_version" + compile 'joda-time:joda-time:2.9.9' } \ No newline at end of file diff --git a/networking/proguard-okhttp.pro b/networking/proguard-okhttp.pro index 6300d5b..d7e9677 100644 --- a/networking/proguard-okhttp.pro +++ b/networking/proguard-okhttp.pro @@ -3,5 +3,6 @@ -keep class com.squareup.okhttp.** { *; } -keep interface com.squareup.okhttp.** { *; } -dontwarn com.squareup.okhttp.** +-dontwarn okhttp3.** -dontwarn okio.** \ No newline at end of file