Merge pull request #104 from wallabag/sdkupdates

beta 2 and support for android 6

.travis.yml

@@ -7,10 +7,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-23.0.1
+    - build-tools-23.0.2
 
     # The SDK version used to compile your project
-    - android-22
+    - android-23
 
     # Additional components
     # - extra-google-google_play_services

app/build.gradle

@@ -1,17 +1,21 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '23.0.1'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         applicationId "fr.gaulupeau.apps.InThePoche"
         minSdkVersion 8
-        targetSdkVersion 22
-        versionCode 12
+        targetSdkVersion 23
+        versionCode 13
         versionName "1.9"
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -27,17 +31,13 @@ android {
             }
         }
     }
-
-    lintOptions {
-        abortOnError false
-    }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.+'
-    compile 'com.android.support:support-v4:22.+'
-    compile 'com.android.support:recyclerview-v7:22.+'
-    compile 'com.android.support:design:22.+'
+    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:support-v4:23.1.0'
+    compile 'com.android.support:recyclerview-v7:23.1.0'
+    compile 'com.android.support:design:23.1.0'
     compile 'de.greenrobot:greendao:2.0.0'
     compile 'com.facebook.stetho:stetho:1.2.0'
     compile 'com.squareup.okhttp:okhttp:2.5.0'