Merge branch 'dev'

.travis.yml

@@ -7,10 +7,10 @@ android:
     # - tools
 
     # The BuildTools version used by your project
-    - build-tools-21.1.2
+    - build-tools-25.0.1
 
     # The SDK version used to compile your project
-    - android-23
+    - android-25
 
     # Additional components
     - extra-google-m2repository
@@ -19,7 +19,7 @@ android:
 
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
-    - sys-img-armeabi-v7a-android-21
+    - sys-img-armeabi-v7a-android-25
 
 before_script:
   # Create and start emulator
@@ -30,5 +30,5 @@ before_script:
 
 script:
   - ./gradlew clean
-  - ./gradlew dualcache-library:connectedAndroidTest -Ptravis --stacktrace
-  #- ./gradlew dualcache:check -Ptravis --stacktrace
+  #- ./gradlew dualcache-library:connectedAndroidTest -Ptravis --stacktrace
+  - ./gradlew dualcache:check -Ptravis --stacktrace

build.gradle

@@ -2,9 +2,10 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 
@@ -21,3 +22,5 @@ allprojects {
         mavenCentral()
     }
 }
+
+apply from: 'dependencies.gradle'

config/quality.gradle

@@ -16,7 +16,7 @@ task checkstyle(type: Checkstyle) {
 }
 
 
-task findbugs(type: FindBugs, dependsOn: assembleDebug) {
+task findbugs(type: FindBugs, dependsOn: "assembleDebug") {
     ignoreFailures = false
     effort = "max"
     reportLevel = "high"

dependencies.gradle

@@ -0,0 +1,13 @@
+ext {
+    compileSdkVersion = 25
+    buildToolsVersion = '25.0.1'
+    minSdkVersion = 12
+    targetSdkVersion = 25
+
+    javaVersion = 1.7
+
+    diskLruVersion = '2.0.2'
+    jacksonDatabindVersion = '2.4.2'
+
+    androidSupportTestRunner = '0.5'
+}

dualcache-demoapp/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply from: '../config/quality.gradle'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
+    compileSdkVersion project.compileSdkVersion
+    buildToolsVersion project.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        versionCode Integer.parseInt(project.VERSION_CODE)
+        versionName project.VERSION_NAME
     }
     buildTypes {
         release {

dualcache-jsonserializer/build.gradle

@@ -2,9 +2,9 @@ apply plugin: 'java'
 apply from: '../maven_push_java.gradle'
 
 dependencies {
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2'
+    compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
     compile project(path: ':dualcache-serializerinterface')
 
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = project.javaVersion
+    targetCompatibility = project.javaVersion
 }

dualcache-library/build.gradle

@@ -1,16 +1,17 @@
+import com.android.builder.core.BuilderConstants
+
 apply plugin: 'com.android.library'
 apply from: '../config/quality.gradle'
 apply from: '../maven_push.gradle'
 
 android {
-
-    compileSdkVersion 23
-    buildToolsVersion '21.1.2'
+    compileSdkVersion project.compileSdkVersion
+    buildToolsVersion project.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 23
-        versionCode 1
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        versionCode Integer.parseInt(project.VERSION_CODE)
         versionName project.VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -26,15 +27,15 @@ android {
 
 dependencies {
     compile project (':dualcache-serializerinterface')
-    compile 'com.jakewharton:disklrucache:2.0.2'
+    compile "com.jakewharton:disklrucache:${project.diskLruVersion}"
 
-    androidTestCompile 'com.android.support.test:runner:0.3'
+    androidTestCompile "com.android.support.test:runner:${project.androidSupportTestRunner}"
     androidTestCompile project (':dualcache-jsonserializer')
 }
 
 android.libraryVariants.all { variant ->
     def name = variant.buildType.name
-    if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) {
+    if (name.equals(BuilderConstants.DEBUG)) {
         return; // Skip debug builds.
     }
     def task = project.tasks.create "jar${name.capitalize()}", Jar