diff --git a/app/build.gradle b/app/build.gradle
index c6d54d0..76e8bef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,13 +3,13 @@ apply plugin: 'android-apt'
apply plugin: 'realm-android'
android {
- compileSdkVersion 24
- buildToolsVersion "24.0.1"
+ compileSdkVersion 25
+ buildToolsVersion '25.0.1'
defaultConfig {
applicationId "com.codeest.geeknews"
minSdkVersion 21
- targetSdkVersion 24
+ targetSdkVersion 25
versionCode 2
versionName "1.0.1"
}
@@ -28,16 +28,20 @@ android {
}
}
+ext {
+ appCompat = "25.0.1"
+}
+
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile files('libs/tbs_sdk_thirdapp_v2.2.0.1096_36549_sharewithdownload_withoutGame_obfs_20160830_211645.jar')
testCompile 'junit:junit:4.12'
//ui
- compile 'com.android.support:appcompat-v7:24.1.1'
- compile 'com.android.support:design:24.1.1'
- compile 'com.android.support:recyclerview-v7:24.1.1'
- compile 'com.android.support:cardview-v7:24.1.1'
+ compile "com.android.support:recyclerview-v7:${appCompat}"
+ compile "com.android.support:appcompat-v7:${appCompat}"
+ compile "com.android.support:cardview-v7:${appCompat}"
+ compile "com.android.support:design:${appCompat}"
//rx
compile 'io.reactivex:rxjava:1.1.0'
@@ -45,7 +49,7 @@ dependencies {
compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
//network
- compile 'com.google.code.gson:gson:2.4'
+ compile 'com.google.code.gson:gson:2.7'
compile 'com.squareup.retrofit2:retrofit:2.0.2'
compile 'com.squareup.retrofit2:converter-gson:2.0.2'
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
@@ -69,7 +73,7 @@ dependencies {
//widget
compile 'com.victor:lib:1.0.4'
compile 'com.prolificinteractive:material-calendarview:1.4.0'
- compile 'net.opacapp:multiline-collapsingtoolbar:1.2.2'
+ compile 'net.opacapp:multiline-collapsingtoolbar:1.3.1'
compile 'com.github.chrisbanes:PhotoView:1.3.0'
compile 'com.miguelcatalan:materialsearchview:1.4.0'
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a92c42f..668fab5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,6 +6,7 @@
#EEEEEE
#FFFFFF
#2C2C2C
+ #80303F9F
#FF4081
#6e000000
diff --git a/build.gradle b/build.gradle
index 9ad36d4..be55d51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.0-rc1'
+ classpath 'com.android.tools.build:gradle:2.3.0-beta1'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath "io.realm:realm-gradle-plugin:1.1.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..8f0c945 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Dec 15 22:39:13 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip