Merge pull request #17 from baz8080/baz8080/prepare-0.2

Prepare v0.2
baz8080 · Nov 11, 2016 · d7a5fa7 · d7a5fa7
2 parents 6646068 + 1d9990a
commit d7a5fa7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 82 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,8 @@ android:
   components:
   - tools
   - platform-tools
-  - android-24
-  - build-tools-24.0.2
+  - android-25
+  - build-tools-25.0.0
   - extra-google-google_play_services
   - extra-google-m2repository
   - extra-android-m2repository

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
         applicationId "com.mbcdev.folkets"
         minSdkVersion 19
-        targetSdkVersion 24
-        versionCode 1
-        versionName "0.1"
+        targetSdkVersion 25
+        versionCode 2
+        versionName "0.2"
 
         resValue "string", "FOLKETS_ZEN_APP_ID", getConfigurationParameter("FOLKETS_ZEN_APP_ID")
         resValue "string", "FOLKETS_ZEN_OAUTH_CLIENT_ID", getConfigurationParameter("FOLKETS_ZEN_OAUTH_CLIENT_ID")
@@ -35,9 +35,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile group: 'com.zendesk', name: 'sdk', version: '1.7.2.1'
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
+    compile group: 'com.zendesk', name: 'sdk', version: '1.7.3.1'
+    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:design:25.0.0'
     compile 'com.squareup.okio:okio:1.10.0'
     compile 'com.jakewharton.timber:timber:4.3.0'
 

diff --git a/app/src/main/java/com/mbcdev/folkets/DividerItemDecoration.java b/app/src/main/java/com/mbcdev/folkets/DividerItemDecoration.java
diff --git a/app/src/main/java/com/mbcdev/folkets/MainActivity.java b/app/src/main/java/com/mbcdev/folkets/MainActivity.java
@@ -6,6 +6,7 @@
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -38,7 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         recyclerView = (RecyclerView) findViewById(R.id.main_recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.addItemDecoration(new DividerItemDecoration(this));
+        recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
 
         presenter = new MainPresenter();
         presenter.attachView(this);
@@ -126,7 +127,6 @@ public Context getContext() {
     @Override
     public void showHelp() {
         new SupportActivity.Builder()
-                .showContactUsButton(false)
                 .show(this);
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong