Skip to content

Commit 56efa15

Browse files
author
Kaushik Gopal
committed
chore + fix: upgrade ButterKnife to 8.0.4 for compiler
previously annotation processor was not being applied, so ButterKnife was not being used
1 parent d3d565f commit 56efa15

28 files changed

+211
-110
lines changed

‎app/BUCK

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
java_library(
2+
name = 'apt_jar_debug',
3+
deps = [
4+
'//.okbuck/cache:com.android.support.support-annotations-24.2.1.jar',
5+
'//.okbuck/cache:com.google.auto.auto-common-0.6.jar',
6+
'//.okbuck/cache:com.google.auto.service.auto-service-1.0-rc2.jar',
7+
'//.okbuck/cache:com.google.guava.guava-18.0.jar',
8+
'//.okbuck/cache:com.jakewharton.butterknife-annotations-8.4.0.jar',
9+
'//.okbuck/cache:com.jakewharton.butterknife-compiler-8.4.0.jar',
10+
'//.okbuck/cache:com.squareup.javapoet-1.7.0.jar',
11+
],
12+
)
13+
114
android_resource(
215
name = 'res_main',
316
res = 'src/main/res',
@@ -16,6 +29,7 @@ android_resource(
1629
'//.okbuck/cache:com.android.support.support-v4-24.2.1.aar',
1730
'//.okbuck/cache:com.android.support.support-vector-drawable-24.2.1.aar',
1831
'//.okbuck/cache:com.github.kaushikgopal.CoreTextUtils-c703fa12b6.aar',
32+
'//.okbuck/cache:com.jakewharton.butterknife-8.4.0.aar',
1933
'//.okbuck/cache:com.jakewharton.rxbinding.rxbinding-0.2.0.aar',
2034
'//.okbuck/cache:com.squareup.leakcanary.leakcanary-android-1.3.aar',
2135
'//.okbuck/cache:io.reactivex.rxjava2.rxandroid-2.0.1.aar',
@@ -46,6 +60,12 @@ android_library(
4660
'src/main/java/**/*.java',
4761
]),
4862
manifest = 'build/okbuck/debug/AndroidManifest.xml',
63+
annotation_processors = [
64+
'butterknife.compiler.ButterKnifeProcessor',
65+
],
66+
annotation_processor_deps = [
67+
':apt_jar_debug',
68+
],
4969
provided_deps = [
5070
'//.okbuck/cache/retrolambda:rt-stub.jar',
5171
],
@@ -71,7 +91,8 @@ android_library(
7191
'//.okbuck/cache:com.github.akarnokd.rxjava2-interop-0.6.1.jar',
7292
'//.okbuck/cache:com.github.kaushikgopal.CoreTextUtils-c703fa12b6.aar',
7393
'//.okbuck/cache:com.google.code.gson.gson-2.6.1.jar',
74-
'//.okbuck/cache:com.jakewharton.butterknife-7.0.1.jar',
94+
'//.okbuck/cache:com.jakewharton.butterknife-8.4.0.aar',
95+
'//.okbuck/cache:com.jakewharton.butterknife-annotations-8.4.0.jar',
7596
'//.okbuck/cache:com.jakewharton.retrofit.retrofit2-rxjava2-adapter-1.0.0.jar',
7697
'//.okbuck/cache:com.jakewharton.rxbinding.rxbinding-0.2.0.aar',
7798
'//.okbuck/cache:com.jakewharton.rxrelay.rxrelay-1.2.0.jar',
@@ -109,6 +130,7 @@ genrule(
109130
],
110131
out = 'lint_debug_out',
111132
bash = '' \
133+
'export ANDROID_LINT_JARS="$(location //.okbuck/cache:com.jakewharton.butterknife-8.4.0-lint.jar)"; ' \
112134
'mkdir -p $OUT; ' \
113135
'exec java ' \
114136
'-Djava.awt.headless=true ' \
@@ -142,6 +164,7 @@ android_manifest(
142164
'//.okbuck/cache:com.android.support.support-v4-24.2.1.aar',
143165
'//.okbuck/cache:com.android.support.support-vector-drawable-24.2.1.aar',
144166
'//.okbuck/cache:com.github.kaushikgopal.CoreTextUtils-c703fa12b6.aar',
167+
'//.okbuck/cache:com.jakewharton.butterknife-8.4.0.aar',
145168
'//.okbuck/cache:com.jakewharton.rxbinding.rxbinding-0.2.0.aar',
146169
'//.okbuck/cache:com.squareup.leakcanary.leakcanary-android-1.3.aar',
147170
'//.okbuck/cache:io.reactivex.rxjava2.rxandroid-2.0.1.aar',
@@ -169,6 +192,19 @@ android_binary(
169192
],
170193
)
171194

195+
java_library(
196+
name = 'apt_jar_release',
197+
deps = [
198+
'//.okbuck/cache:com.android.support.support-annotations-24.2.1.jar',
199+
'//.okbuck/cache:com.google.auto.auto-common-0.6.jar',
200+
'//.okbuck/cache:com.google.auto.service.auto-service-1.0-rc2.jar',
201+
'//.okbuck/cache:com.google.guava.guava-18.0.jar',
202+
'//.okbuck/cache:com.jakewharton.butterknife-annotations-8.4.0.jar',
203+
'//.okbuck/cache:com.jakewharton.butterknife-compiler-8.4.0.jar',
204+
'//.okbuck/cache:com.squareup.javapoet-1.7.0.jar',
205+
],
206+
)
207+
172208
android_build_config(
173209
name = 'build_config_release',
174210
package = 'com.morihacky.android.rxjava',
@@ -190,6 +226,12 @@ android_library(
190226
'src/main/java/**/*.java',
191227
]),
192228
manifest = 'build/okbuck/release/AndroidManifest.xml',
229+
annotation_processors = [
230+
'butterknife.compiler.ButterKnifeProcessor',
231+
],
232+
annotation_processor_deps = [
233+
':apt_jar_release',
234+
],
193235
provided_deps = [
194236
'//.okbuck/cache/retrolambda:rt-stub.jar',
195237
],
@@ -215,7 +257,8 @@ android_library(
215257
'//.okbuck/cache:com.github.akarnokd.rxjava2-interop-0.6.1.jar',
216258
'//.okbuck/cache:com.github.kaushikgopal.CoreTextUtils-c703fa12b6.aar',
217259
'//.okbuck/cache:com.google.code.gson.gson-2.6.1.jar',
218-
'//.okbuck/cache:com.jakewharton.butterknife-7.0.1.jar',
260+
'//.okbuck/cache:com.jakewharton.butterknife-8.4.0.aar',
261+
'//.okbuck/cache:com.jakewharton.butterknife-annotations-8.4.0.jar',
219262
'//.okbuck/cache:com.jakewharton.retrofit.retrofit2-rxjava2-adapter-1.0.0.jar',
220263
'//.okbuck/cache:com.jakewharton.rxbinding.rxbinding-0.2.0.aar',
221264
'//.okbuck/cache:com.jakewharton.rxrelay.rxrelay-1.2.0.jar',
@@ -251,6 +294,7 @@ genrule(
251294
],
252295
out = 'lint_release_out',
253296
bash = '' \
297+
'export ANDROID_LINT_JARS="$(location //.okbuck/cache:com.jakewharton.butterknife-8.4.0-lint.jar)"; ' \
254298
'mkdir -p $OUT; ' \
255299
'exec java ' \
256300
'-Djava.awt.headless=true ' \
@@ -284,6 +328,7 @@ android_manifest(
284328
'//.okbuck/cache:com.android.support.support-v4-24.2.1.aar',
285329
'//.okbuck/cache:com.android.support.support-vector-drawable-24.2.1.aar',
286330
'//.okbuck/cache:com.github.kaushikgopal.CoreTextUtils-c703fa12b6.aar',
331+
'//.okbuck/cache:com.jakewharton.butterknife-8.4.0.aar',
287332
'//.okbuck/cache:com.jakewharton.rxbinding.rxbinding-0.2.0.aar',
288333
'//.okbuck/cache:com.squareup.leakcanary.leakcanary-android-no-op-1.3.aar',
289334
'//.okbuck/cache:io.reactivex.rxjava2.rxandroid-2.0.1.aar',

‎app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
88
// can be removed with android-gradle plugin is upgraded to 2.2
99
// https://twitter.com/JakeWharton/status/760836175586267136
10-
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
10+
// classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
1111
}
1212

1313
// Exclude the lombok version that the android plugin depends on.
@@ -31,7 +31,8 @@ dependencies {
3131
compile "com.android.support:recyclerview-v7:${supportLibVersion}"
3232

3333
compile 'com.github.kaushikgopal:CoreTextUtils:c703fa12b6'
34-
compile 'com.jakewharton:butterknife:7.0.1'
34+
compile 'com.jakewharton:butterknife:8.4.0'
35+
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
3536
compile 'com.jakewharton.timber:timber:2.4.2'
3637
compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
3738
compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"

‎app/src/main/java/com/morihacky/android/rxjava/fragments/BufferDemoFragment.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.widget.Button;
1111
import android.widget.ListView;
1212

13+
import butterknife.Unbinder;
1314
import com.jakewharton.rxbinding.view.RxView;
1415
import com.morihacky.android.rxjava.R; import com.morihacky.android.rxjava.R2;
1516
import com.morihacky.android.rxjava.wiring.LogAdapter;
@@ -18,7 +19,7 @@
1819
import java.util.List;
1920
import java.util.concurrent.TimeUnit;
2021

21-
import butterknife.Bind;
22+
import butterknife.BindView;
2223
import butterknife.ButterKnife;
2324
import hu.akarnokd.rxjava.interop.RxJavaInterop;
2425
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -43,12 +44,13 @@
4344
public class BufferDemoFragment
4445
extends BaseFragment {
4546

46-
@Bind(R2.id.list_threading_log) ListView _logsList;
47-
@Bind(R2.id.btn_start_operation) Button _tapBtn;
47+
@BindView(R2.id.list_threading_log) ListView _logsList;
48+
@BindView(R2.id.btn_start_operation) Button _tapBtn;
4849

4950
private LogAdapter _adapter;
5051
private List<String> _logs;
5152

53+
private Unbinder _unbinder;
5254
private Disposable _disposable;
5355

5456
@Override
@@ -74,13 +76,13 @@ public View onCreateView(LayoutInflater inflater,
7476
@Nullable ViewGroup container,
7577
@Nullable Bundle savedInstanceState) {
7678
View layout = inflater.inflate(R.layout.fragment_buffer, container, false);
77-
ButterKnife.bind(this, layout);
79+
_unbinder = ButterKnife.bind(this, layout);
7880
return layout;
7981
}
8082

8183
@Override public void onDestroyView() {
8284
super.onDestroyView();
83-
ButterKnife.unbind(this);
85+
_unbinder.unbind();
8486
}
8587

8688
// -----------------------------------------------------------------------------------

‎app/src/main/java/com/morihacky/android/rxjava/fragments/ConcurrencyWithSchedulersDemoFragment.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
import android.widget.ArrayAdapter;
1212
import android.widget.ListView;
1313
import android.widget.ProgressBar;
14-
import butterknife.Bind;
14+
import butterknife.BindView;
1515
import butterknife.ButterKnife;
1616
import butterknife.OnClick;
17+
import butterknife.Unbinder;
1718
import com.morihacky.android.rxjava.R; import com.morihacky.android.rxjava.R2;
1819
import io.reactivex.Observable;
1920
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -27,17 +28,18 @@
2728
public class ConcurrencyWithSchedulersDemoFragment
2829
extends BaseFragment {
2930

30-
@Bind(R2.id.progress_operation_running) ProgressBar _progress;
31-
@Bind(R2.id.list_threading_log) ListView _logsList;
31+
@BindView(R2.id.progress_operation_running) ProgressBar _progress;
32+
@BindView(R2.id.list_threading_log) ListView _logsList;
3233

3334
private LogAdapter _adapter;
3435
private List<String> _logs;
3536
private CompositeDisposable _disposables = new CompositeDisposable();
37+
private Unbinder _unbinder;
3638

3739
@Override
3840
public void onDestroy() {
3941
super.onDestroy();
40-
ButterKnife.unbind(this);
42+
_unbinder.unbind();
4143
_disposables.clear();
4244
}
4345

@@ -52,7 +54,7 @@ public View onCreateView(LayoutInflater inflater,
5254
@Nullable ViewGroup container,
5355
@Nullable Bundle savedInstanceState) {
5456
View layout = inflater.inflate(R.layout.fragment_concurrency_schedulers, container, false);
55-
ButterKnife.bind(this, layout);
57+
_unbinder = ButterKnife.bind(this, layout);
5658
return layout;
5759
}
5860

‎app/src/main/java/com/morihacky/android/rxjava/fragments/DebounceSearchEmitterFragment.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.widget.EditText;
1313
import android.widget.ListView;
1414

15+
import butterknife.Unbinder;
1516
import com.jakewharton.rxbinding.widget.RxTextView;
1617
import com.jakewharton.rxbinding.widget.TextViewTextChangeEvent;
1718
import com.morihacky.android.rxjava.R; import com.morihacky.android.rxjava.R2;
@@ -20,7 +21,7 @@
2021
import java.util.List;
2122
import java.util.concurrent.TimeUnit;
2223

23-
import butterknife.Bind;
24+
import butterknife.BindView;
2425
import butterknife.ButterKnife;
2526
import butterknife.OnClick;
2627
import hu.akarnokd.rxjava.interop.RxJavaInterop;
@@ -35,27 +36,28 @@
3536
public class DebounceSearchEmitterFragment
3637
extends BaseFragment {
3738

38-
@Bind(R2.id.list_threading_log) ListView _logsList;
39-
@Bind(R2.id.input_txt_debounce) EditText _inputSearchText;
39+
@BindView(R2.id.list_threading_log) ListView _logsList;
40+
@BindView(R2.id.input_txt_debounce) EditText _inputSearchText;
4041

4142
private LogAdapter _adapter;
4243
private List<String> _logs;
4344

45+
private Unbinder _unbinder;
4446
private Disposable _disposable;
4547

4648
@Override
4749
public void onDestroy() {
4850
super.onDestroy();
4951
_disposable.dispose();
50-
ButterKnife.unbind(this);
52+
_unbinder.unbind();
5153
}
5254

5355
@Override
5456
public View onCreateView(LayoutInflater inflater,
5557
@Nullable ViewGroup container,
5658
@Nullable Bundle savedInstanceState) {
5759
View layout = inflater.inflate(R.layout.fragment_debounce, container, false);
58-
ButterKnife.bind(this, layout);
60+
_unbinder = ButterKnife.bind(this, layout);
5961
return layout;
6062
}
6163

‎app/src/main/java/com/morihacky/android/rxjava/fragments/DoubleBindingTextViewFragment.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import android.view.ViewGroup;
88
import android.widget.EditText;
99
import android.widget.TextView;
10-
import butterknife.Bind;
10+
import butterknife.BindView;
1111
import butterknife.ButterKnife;
1212
import butterknife.OnTextChanged;
13+
import butterknife.Unbinder;
1314
import com.morihacky.android.rxjava.R; import com.morihacky.android.rxjava.R2;
1415
import io.reactivex.disposables.Disposable;
1516
import io.reactivex.processors.PublishProcessor;
@@ -20,10 +21,11 @@
2021
public class DoubleBindingTextViewFragment
2122
extends BaseFragment {
2223

23-
@Bind(R2.id.double_binding_num1) EditText _number1;
24-
@Bind(R2.id.double_binding_num2) EditText _number2;
25-
@Bind(R2.id.double_binding_result) TextView _result;
24+
@BindView(R2.id.double_binding_num1) EditText _number1;
25+
@BindView(R2.id.double_binding_num2) EditText _number2;
26+
@BindView(R2.id.double_binding_result) TextView _result;
2627

28+
private Unbinder _unbinder;
2729
Disposable _disposable;
2830
PublishProcessor<Float> _resultEmitterSubject;
2931

@@ -32,7 +34,7 @@ public View onCreateView(LayoutInflater inflater,
3234
@Nullable ViewGroup container,
3335
@Nullable Bundle savedInstanceState) {
3436
View layout = inflater.inflate(R.layout.fragment_double_binding_textview, container, false);
35-
ButterKnife.bind(this, layout);
37+
_unbinder = ButterKnife.bind(this, layout);
3638

3739
_resultEmitterSubject = PublishProcessor.create();
3840

@@ -66,6 +68,6 @@ public void onNumberChanged() {
6668
public void onDestroyView() {
6769
super.onDestroyView();
6870
_disposable.dispose();
69-
ButterKnife.unbind(this);
71+
_unbinder.unbind();
7072
}
7173
}

‎app/src/main/java/com/morihacky/android/rxjava/fragments/ExponentialBackoffFragment.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import android.view.View;
88
import android.view.ViewGroup;
99
import android.widget.ListView;
10-
import butterknife.Bind;
10+
import butterknife.BindView;
1111
import butterknife.ButterKnife;
1212
import butterknife.OnClick;
13+
import butterknife.Unbinder;
1314
import com.morihacky.android.rxjava.R; import com.morihacky.android.rxjava.R2;
1415
import com.morihacky.android.rxjava.wiring.LogAdapter;
1516
import hu.akarnokd.rxjava.interop.RxJavaInterop;
@@ -30,8 +31,10 @@
3031
public class ExponentialBackoffFragment
3132
extends BaseFragment {
3233

33-
@Bind(R2.id.list_threading_log) ListView _logList;
34+
@BindView(R2.id.list_threading_log) ListView _logList;
3435
private LogAdapter _adapter;
36+
37+
private Unbinder _unbinder;
3538
private CompositeDisposable _disposables = new CompositeDisposable();
3639
private List<String> _logs;
3740

@@ -40,7 +43,7 @@ public View onCreateView(LayoutInflater inflater,
4043
@Nullable ViewGroup container,
4144
@Nullable Bundle savedInstanceState) {
4245
View layout = inflater.inflate(R.layout.fragment_exponential_backoff, container, false);
43-
ButterKnife.bind(this, layout);
46+
_unbinder = ButterKnife.bind(this, layout);
4447
return layout;
4548
}
4649

@@ -60,7 +63,7 @@ public void onPause() {
6063
@Override
6164
public void onDestroyView() {
6265
super.onDestroyView();
63-
ButterKnife.unbind(this);
66+
_unbinder.unbind();
6467
}
6568

6669
// -----------------------------------------------------------------------------------

0 commit comments

Comments
 (0)