Merge branch 'marukami-upgrade-libs'

Kaushik Gopal · Kaushik Gopal · commit 8da6098afa3b · 2016-10-08T16:19:23.000-07:00
* marukami-upgrade-libs:
  upgrade: build tools, support library, and target api
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,6 +19,7 @@ apply plugin: 'me.tatarka.retrolambda'
 
 ext {
     supportLibVersion = "24.2.1"
+    sdkVersion = 24
 }
 
 dependencies {
@@ -48,13 +49,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion sdkVersion
     buildToolsVersion '23.0.3'
 
     defaultConfig {
         applicationId "com.morihacky.android.rxjava"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion sdkVersion
         versionCode 2
         versionName "1.2"
     }
diff --git a/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheConcatFragment.java b/app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheConcatFragment.java
@@ -7,22 +7,20 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
 import com.morihacky.android.rxjava.R;
 import com.morihacky.android.rxjava.retrofit.Contributor;
 import com.morihacky.android.rxjava.retrofit.GithubApi;
 import com.morihacky.android.rxjava.retrofit.GithubService;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
-import butterknife.Bind;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
 import rx.Observable;
 import rx.Subscriber;
 import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 import timber.log.Timber;
 
 public class PseudoCacheConcatFragment

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ apply plugin: 'me.tatarka.retrolambda'`
`19`	`19`
`20`	`20`	`ext {`
`21`	`21`	`supportLibVersion = "24.2.1"`
	`22`	`+ sdkVersion = 24`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`dependencies {`
`@@ -48,13 +49,13 @@ dependencies {`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`android {`
`51`		`- compileSdkVersion 23`
	`52`	`+ compileSdkVersion sdkVersion`
`52`	`53`	`buildToolsVersion '23.0.3'`
`53`	`54`
`54`	`55`	`defaultConfig {`
`55`	`56`	`applicationId "com.morihacky.android.rxjava"`
`56`	`57`	`minSdkVersion 15`
`57`		`- targetSdkVersion 23`
	`58`	`+ targetSdkVersion sdkVersion`
`58`	`59`	`versionCode 2`
`59`	`60`	`versionName "1.2"`
`60`	`61`	`}`