From b5c12aba1d9e0d1239d7ac736ada6956c1bcf60d Mon Sep 17 00:00:00 2001 From: fabianterhorst Date: Sat, 6 Aug 2016 14:03:29 +0200 Subject: [PATCH] update dependencies --- ApiClient.iml | 2 +- .../apiclient-accountmanager.iml | 30 +++++----- apiclient-accountmanager/build.gradle | 8 +-- apiclient-components/build.gradle | 10 ++-- apiclient/apiclient.iml | 55 ++++++++++--------- apiclient/build.gradle | 10 ++-- app/build.gradle | 10 ++-- .../apiclient/app/RepositoriesAdapter.java | 2 +- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 2 +- publish.gradle | 6 +- publishaccountmanager.gradle | 6 +- publishcomponents.gradle | 6 +- 13 files changed, 79 insertions(+), 74 deletions(-) diff --git a/ApiClient.iml b/ApiClient.iml index cd6b6f9..22b16c7 100644 --- a/ApiClient.iml +++ b/ApiClient.iml @@ -8,7 +8,7 @@ - + diff --git a/apiclient-accountmanager/apiclient-accountmanager.iml b/apiclient-accountmanager/apiclient-accountmanager.iml index 796fe1d..19d23bf 100644 --- a/apiclient-accountmanager/apiclient-accountmanager.iml +++ b/apiclient-accountmanager/apiclient-accountmanager.iml @@ -65,14 +65,6 @@ - - - - - - - - @@ -81,6 +73,14 @@ + + + + + + + + @@ -88,21 +88,23 @@ + + - + - - - - - + + + + + \ No newline at end of file diff --git a/apiclient-accountmanager/build.gradle b/apiclient-accountmanager/build.gradle index 48999c1..908d16c 100644 --- a/apiclient-accountmanager/build.gradle +++ b/apiclient-accountmanager/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 24 + buildToolsVersion "24.0.1" defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 1 versionName "1.0" } @@ -19,7 +19,7 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:23.3.0' + compile 'com.android.support:appcompat-v7:24.1.1' } diff --git a/apiclient-components/build.gradle b/apiclient-components/build.gradle index dbf0f04..59ea60a 100644 --- a/apiclient-components/build.gradle +++ b/apiclient-components/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 24 + buildToolsVersion "24.0.1" defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 1 versionName "1.0" } @@ -19,9 +19,9 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:23.3.0' + compile 'com.android.support:appcompat-v7:24.1.1' compile 'com.trello:rxlifecycle:0.5.0' - compile 'io.reactivex:rxjava:1.1.5' + compile 'io.reactivex:rxjava:1.1.8' compile 'io.reactivex:rxandroid:1.2.0' } diff --git a/apiclient/apiclient.iml b/apiclient/apiclient.iml index 9a0a8f8..5222a40 100644 --- a/apiclient/apiclient.iml +++ b/apiclient/apiclient.iml @@ -1,5 +1,5 @@ - + @@ -25,7 +25,7 @@ - + @@ -36,6 +36,7 @@ + @@ -49,6 +50,7 @@ + @@ -56,6 +58,7 @@ + @@ -63,13 +66,7 @@ - - - - - - - + @@ -77,39 +74,45 @@ + + + + + + + + + - - - + + - - + - - - - - - + + + + + + + + + + + - - - - - - \ No newline at end of file diff --git a/apiclient/build.gradle b/apiclient/build.gradle index b20bea8..a7988db 100644 --- a/apiclient/build.gradle +++ b/apiclient/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'realm-android' apply plugin: 'me.tatarka.retrolambda' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 24 + buildToolsVersion "24.0.1" defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 1 versionName "1.0" } @@ -31,9 +31,9 @@ dependencies { compile 'com.squareup.retrofit2:converter-gson:2.0.2' compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2' - compile 'com.squareup.okhttp3:okhttp:3.2.0' + compile 'com.squareup.okhttp3:okhttp:3.4.1' - compile 'io.reactivex:rxjava:1.1.5' + compile 'io.reactivex:rxjava:1.1.8' compile 'io.reactivex:rxjava-async-util:0.21.0' compile 'io.reactivex:rxandroid:1.2.0' } diff --git a/app/build.gradle b/app/build.gradle index d7c33b1..48dcbde 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'me.tatarka.retrolambda' apply plugin: 'realm-android' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 24 + buildToolsVersion "24.0.1" defaultConfig { applicationId "io.fabianterhorst.apiclient.app" minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 1 versionName "1.0" } @@ -27,8 +27,8 @@ android { dependencies { retrolambdaConfig 'net.orfjackal.retrolambda:retrolambda:2.3.0' - compile 'com.android.support:appcompat-v7:23.3.0' - compile 'com.android.support:recyclerview-v7:23.3.0' + compile 'com.android.support:appcompat-v7:24.1.1' + compile 'com.android.support:recyclerview-v7:24.1.1' compile 'com.trello:rxlifecycle-components:0.6.0' compile project (':apiclient') } diff --git a/app/src/main/java/io/fabianterhorst/apiclient/app/RepositoriesAdapter.java b/app/src/main/java/io/fabianterhorst/apiclient/app/RepositoriesAdapter.java index 52e3080..ec9cec0 100644 --- a/app/src/main/java/io/fabianterhorst/apiclient/app/RepositoriesAdapter.java +++ b/app/src/main/java/io/fabianterhorst/apiclient/app/RepositoriesAdapter.java @@ -53,4 +53,4 @@ public void onBindViewHolder(ViewHolder holder, int position) { public int getItemCount() { return repositories.size(); } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 4a29e4c..3cefbe8 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,10 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:2.1.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath 'io.realm:realm-gradle-plugin:0.90.0-SNAPSHOT' + classpath 'io.realm:realm-gradle-plugin:1.1.1' classpath 'me.tatarka:gradle-retrolambda:3.3.0-beta4' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + //classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' } } @@ -30,7 +30,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.13' + gradleVersion = '2.14.1' } task clean(type: Delete) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ab100c0..04e285f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/publish.gradle b/publish.gradle index e5758ab..1f4de94 100644 --- a/publish.gradle +++ b/publish.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.github.dcendents.android-maven' +//apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' def siteUrl = 'https://github.com/FabianTerhorst/ApiClient' @@ -7,7 +7,7 @@ def gitUrl = 'https://github.com/FabianTerhorst/ApiClient.git' version = "0.3" group = "io.fabianterhorst" -install { +/*install { repositories.mavenInstaller { // This generates POM.xml with proper parameters pom { @@ -41,7 +41,7 @@ install { } } } -} +}*/ task sourcesJar(type: Jar) { diff --git a/publishaccountmanager.gradle b/publishaccountmanager.gradle index a30225c..631ac6d 100644 --- a/publishaccountmanager.gradle +++ b/publishaccountmanager.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.github.dcendents.android-maven' +//apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' def siteUrl = 'https://github.com/FabianTerhorst/ApiClient' @@ -7,7 +7,7 @@ def gitUrl = 'https://github.com/FabianTerhorst/ApiClient.git' version = "0.1" group = "io.fabianterhorst" -install { +/*install { repositories.mavenInstaller { // This generates POM.xml with proper parameters pom { @@ -41,7 +41,7 @@ install { } } } -} +}*/ task sourcesJar(type: Jar) { diff --git a/publishcomponents.gradle b/publishcomponents.gradle index c227598..62fce0d 100644 --- a/publishcomponents.gradle +++ b/publishcomponents.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.github.dcendents.android-maven' +//apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' def siteUrl = 'https://github.com/FabianTerhorst/ApiClient' @@ -7,7 +7,7 @@ def gitUrl = 'https://github.com/FabianTerhorst/ApiClient.git' version = "0.1" group = "io.fabianterhorst" -install { +/*install { repositories.mavenInstaller { // This generates POM.xml with proper parameters pom { @@ -41,7 +41,7 @@ install { } } } -} +}*/ task sourcesJar(type: Jar) {