Butter knife 6.1.0 to 8.0.1

build.gradle

@@ -24,7 +24,7 @@ ext {
     retrofitVersionLatest = '2.0.0'
     okHttpVersion = '2.0.0'
     flipTableVersion = '1.0.1'
-    butterKnifeVersion = '6.1.0'
+    butterKnifeVersion = '8.0.1'
 
 
 }

gradle.properties

@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+org.gradle.daemon=true
+org.gradle.jvmargs=-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m

mifosng-android/build.gradle

@@ -114,9 +114,12 @@ tasks.withType(com.android.build.gradle.tasks.PackageApplication) {
         pkgTask.jniFolders.add(new File(buildDir, 'native-libs'))
 }
 
-allprojects {
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
+tasks.withType(JavaCompile) {
+    configure(options) {
+        // TODO
+        compilerArgs << "-Xlint:deprecation"
+        compilerArgs << "-Xlint:-unchecked"
+        compilerArgs << "-Xlint:-rawtypes"
     }
 }
 
@@ -145,14 +148,19 @@ dependencies {
     compile "com.google.dagger:dagger:$rootProject.daggerVersion"
     provided 'javax.annotation:jsr250-api:1.0'                //Required by Dagger2
 
+    //Butter Knife
+    compile "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
+    apt "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
+
+
     //Square dependencies
     compile "com.squareup.retrofit:retrofit:$rootProject.retrofitVersion"
     compile "com.squareup.retrofit2:converter-gson:$rootProject.retrofitVersionLatest"
     compile "com.squareup.retrofit2:adapter-rxjava:$rootProject.retrofitVersionLatest"
     compile "com.squareup.okhttp:okhttp:$rootProject.okHttpVersion"
     compile "com.squareup.okhttp:okhttp-urlconnection:$rootProject.okHttpVersion"
     compile "com.jakewharton.fliptables:fliptables:$rootProject.flipTableVersion"
-    compile "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
+
     compile 'javax.annotation:jsr250-api:1.0@jar'
     compile 'com.squareup:otto:1.3.8'
 

mifosng-android/proguard-rules.pro

@@ -18,14 +18,14 @@
 
 -dontobfuscate
 
--keep class butterknife.** { *; }
--dontwarn butterknife.internal.**
--keep class **$$ViewInjector { *; }
-
--keepclasseswithmembernames class * {
-    @butterknife.* <fields>;
-}
-
--keepclasseswithmembernames class * {
-    @butterknife.* <methods>;
-}
+#-keep class butterknife.** { *; }
+#-dontwarn butterknife.internal.**
+#-keep class **$$ViewInjector { *; }
+#
+#-keepclasseswithmembernames class * {
+#    @butterknife.* <fields>;
+#}
+#
+#-keepclasseswithmembernames class * {
+#    @butterknife.* <methods>;
+#}

mifosng-android/src/instrumentTest/java/com/mifos/mifosxdroid/tests/SavingsAccountSummaryFragmentTest.java

@@ -80,7 +80,7 @@ public DepositType(Integer id, String code, String value) {
         //waiting for the API
         Thread.sleep(8000);
 
-        //instantiating the views that we're going to test@InjectView(R.id.tv_clientName)
+        //instantiating the views that we're going to test@BindView(R.id.tv_clientName)
         tv_clientName = (TextView) clientActivity.findViewById(R.id.tv_clientName);
         quickContactBadge = (QuickContactBadge) clientActivity.findViewById(R.id
                 .quickContactBadge_client);

mifosng-android/src/main/java/com/mifos/App.java

@@ -11,7 +11,7 @@
 import com.crashlytics.android.Crashlytics;
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.fonts.MaterialModule;
-import com.mifos.api.ApiManager;
+import com.mifos.api.BaseApiManager;
 import com.mifos.mifosxdroid.injection.component.ApplicationComponent;
 import com.mifos.mifosxdroid.injection.component.DaggerApplicationComponent;
 import com.mifos.mifosxdroid.injection.module.ApplicationModule;
@@ -27,7 +27,7 @@ public class App extends SugarApp {
 
     public static final Map<Integer, Typeface> typefaceManager = new HashMap<>();
 
-    public static ApiManager apiManager;
+    public static BaseApiManager baseApiManager;
 
     private static App instance;
 
@@ -51,7 +51,7 @@ public void onCreate() {
         instance = this;
         Crashlytics.start(this);
 
-        apiManager = new ApiManager();
+        baseApiManager = new BaseApiManager();
         Iconify.with(new MaterialModule());
     }