Merge pull request #504 from pushtorefresh/new-deps

New build tools and dependencies
pushtorefresh · Sep 5, 2015 · d4b786b · d4b786b
2 parents 64da82a + ac3f0d7
commit d4b786b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         // Android Gradle plugin
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.4.0-beta1'
 
         // Resolves android-sdk dependencies
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
@@ -57,15 +57,18 @@ task wrapper(type: Wrapper) {
 }
 
 ext {
-    buildToolsVersion = '22.0.1'
-    compileSdkVersion = 22
+    buildToolsVersion = '23'
+    compileSdkVersion = 23
     minSdkVersion = 14
 }
 
+def supportLibsVersion = '23.0.1'
+def daggerVersion = '2.0.1'
+
 ext.libraries = [
         // Core libraries
-        supportAnnotations             : 'com.android.support:support-annotations:22.2.0',
-        rxJava                         : 'io.reactivex:rxjava:1.0.13',
+        supportAnnotations             : 'com.android.support:support-annotations:' + supportLibsVersion,
+        rxJava                         : 'io.reactivex:rxjava:1.0.14',
 
         // Parts of StorIO
         storIOCommon                   : project(':storio-common'),
@@ -83,20 +86,20 @@ ext.libraries = [
         powerMockMockito               : 'org.powermock:powermock-api-mockito:1.6.2',
 
         equalsVerifier                 : 'nl.jqno.equalsverifier:equalsverifier:1.7.2',
-        privateConstructorChecker      : 'com.pushtorefresh.java-private-constructor-checker:checker:1.0.0',
+        privateConstructorChecker      : 'com.pushtorefresh.java-private-constructor-checker:checker:1.1.0',
         guava                          : 'com.google.guava:guava:18.0',
         robolectric                    : 'org.robolectric:robolectric:3.0',
 
-        dagger                         : 'com.google.dagger:dagger:2.0',
-        daggerCompiler                 : 'com.google.dagger:dagger-compiler:2.0',
+        dagger                         : 'com.google.dagger:dagger:' + daggerVersion,
+        daggerCompiler                 : 'com.google.dagger:dagger-compiler:' + daggerVersion,
 
         javaxInject                    : 'javax.inject:javax.inject:1',
         javaxAnnotationApi             : 'javax.annotation:javax.annotation-api:1.2',
 
-        butterKnife                    : 'com.jakewharton:butterknife:6.1.0',
-        appCompat                      : 'com.android.support:appcompat-v7:22.1.1',
-        recyclerView                   : 'com.android.support:recyclerview-v7:22.1.1',
-        rxAndroid                      : 'io.reactivex:rxandroid:0.24.0',
+        butterKnife                    : 'com.jakewharton:butterknife:7.0.1',
+        appCompat                      : 'com.android.support:appcompat-v7:' + supportLibsVersion,
+        recyclerView                   : 'com.android.support:recyclerview-v7:' + supportLibsVersion,
+        rxAndroid                      : 'io.reactivex:rxandroid:1.0.1',
         timber                         : 'com.jakewharton.timber:timber:3.0.1',
         leakCanary                     : 'com.squareup.leakcanary:leakcanary-android:1.3',
         leakCanaryNoOp                 : 'com.squareup.leakcanary:leakcanary-android-no-op:1.3',

diff --git a/storio-sample-app/src/main/AndroidManifest.xml b/storio-sample-app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
 
     <application
         android:name=".SampleApp"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">

diff --git a/...io-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/activity/MainActivity.java b/...io-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/activity/MainActivity.java
@@ -18,7 +18,7 @@ public class MainActivity extends BaseActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
     }
 
     @OnClick(R.id.main_db_sample)

diff --git a/...io-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/adapter/TweetsAdapter.java b/...io-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/adapter/TweetsAdapter.java
@@ -13,8 +13,8 @@
 
 import java.util.List;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 public class TweetsAdapter extends RecyclerView.Adapter<TweetsAdapter.ViewHolder> {
 
@@ -46,15 +46,15 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
 
     static class ViewHolder extends RecyclerView.ViewHolder {
 
-        @InjectView(R.id.list_item_tweet_author)
+        @Bind(R.id.list_item_tweet_author)
         TextView authorTextView;
 
-        @InjectView(R.id.list_item_tweet_content)
+        @Bind(R.id.list_item_tweet_content)
         TextView contentTextView;
 
         public ViewHolder(@NonNull View itemView) {
             super(itemView);
-            ButterKnife.inject(this, itemView);
+            ButterKnife.bind(this, itemView);
         }
     }
 }
diff --git a/...-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/fragment/TweetsFragment.java b/...-sample-app/src/main/java/com/pushtorefresh/storio/sample/ui/fragment/TweetsFragment.java
@@ -25,8 +25,8 @@
 
 import javax.inject.Inject;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 import butterknife.OnClick;
 import rx.Observer;
 import rx.Subscription;
@@ -46,7 +46,7 @@ public class TweetsFragment extends BaseFragment {
 
     UiStateController uiStateController;
 
-    @InjectView(R.id.tweets_recycler_view)
+    @Bind(R.id.tweets_recycler_view)
     RecyclerView recyclerView;
 
     TweetsAdapter tweetsAdapter;
@@ -66,7 +66,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        ButterKnife.inject(this, view);
+        ButterKnife.bind(this, view);
 
         recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         recyclerView.setAdapter(tweetsAdapter);