Update Gradle, fix annotation

Author: Daniel

build.gradle

@@ -1,18 +1,17 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
     }
 
     group = 'eu.inloop'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Mar 13 13:06:15 CET 2017
+#Thu Nov 02 07:53:43 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

library/build.gradle

@@ -26,12 +26,12 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-fragment:26.1.0'
-    compile 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:support-fragment:26.1.0'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
 
-    androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'com.android.support.test:runner:1.0.1'
-    androidTestCompile 'com.android.support.test:rules:1.0.1'
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test:rules:1.0.1'
 }
 
 task androidJavadocs(type: Javadoc) {

library/src/main/java/eu/inloop/viewmodel/binding/ViewModelBaseBindingFragment.java

@@ -36,7 +36,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     }
 
     @SuppressWarnings("unused")
-    @NonNull
+    @Nullable
     public B getBinding() {
         try {
             return (B) getViewModelHelper().getBinding();

sample/build.gradle

@@ -30,10 +30,11 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-fragment:26.1.0'
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    compile 'com.jakewharton:butterknife:5.1.2'
-    compile project(':library')
+    implementation 'com.android.support:support-fragment:26.1.0'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.1'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    implementation 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation project(':library')
 }

sample/src/main/java/eu/inloop/viewmodel/sample/activity/MainActivity.java

@@ -14,7 +14,7 @@ public class MainActivity extends ViewModelBaseEmptyActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction().replace(R.id.root_content, new UserListFragment(), "user-list-fragment").commit();

sample/src/main/java/eu/inloop/viewmodel/sample/activity/SampleBindingActivity.java

@@ -19,7 +19,7 @@ public static Intent newIntent(Context context) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction().replace(R.id.root_content, new SampleBindingFragment(), "sample-binding-fragment").commit();

sample/src/main/java/eu/inloop/viewmodel/sample/fragment/SampleBundleFragment.java

@@ -33,7 +33,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        ButterKnife.inject(this, view);
+        ButterKnife.bind(this, view);
         setModelView(this);
     }
 }

sample/src/main/java/eu/inloop/viewmodel/sample/fragment/UserListFragment.java

@@ -17,8 +17,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 import eu.inloop.viewmodel.base.ViewModelBaseFragment;
 import eu.inloop.viewmodel.binding.ViewModelBindingConfig;
 import eu.inloop.viewmodel.sample.R;
@@ -30,13 +30,13 @@
 
 public class UserListFragment extends ViewModelBaseFragment<IUserListView, UserListViewModel> implements IUserListView {
 
-    @InjectView(android.R.id.progress)
+    @BindView(android.R.id.progress)
     View mProgressView;
-    @InjectView(R.id.progress_text)
+    @BindView(R.id.progress_text)
     TextView mProgressText;
-    @InjectView(android.R.id.list)
+    @BindView(android.R.id.list)
     ListView mListview;
-    @InjectView(R.id.open_binding_fragment)
+    @BindView(R.id.open_binding_fragment)
     Button mOpenBindingFragment;
 
     private ArrayAdapter<String> mAdapter;
@@ -50,7 +50,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.fragment_userlist, container, false);
-        ButterKnife.inject(this, view);
+        ButterKnife.bind(this, view);
 
         final View headerView = inflater.inflate(R.layout.view_header_info, null, false);
         headerView.findViewById(R.id.button1).setOnClickListener(new View.OnClickListener() {