Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit 64c748d

Browse files
author
Evgenii Kanivets
committed
#142[1h]. Update dependencies. Update .travis.yml.
1 parent b35dc70 commit 64c748d

33 files changed

+143
-150
lines changed

.travis.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,26 @@ language: android
22
jdk: oraclejdk8
33
android:
44
components:
5-
# Uncomment the lines below if you want to
6-
# use the latest revision of Android SDK Tools
7-
- platform-tools
8-
- tools
9-
105
# The BuildTools version used by your project
11-
- build-tools-25.0.2
6+
- build-tools-26.0.2
127

138
# The SDK version used to compile your project
14-
- android-25
9+
- android-21
10+
- android-26
1511

1612
# Additional components
1713
- extra-google-google_play_services
1814
- extra-google-m2repository
1915
- extra-android-m2repository
20-
- addon-google_apis-google-19
16+
- addon-google_apis-google-26
2117

2218
# Specify at least one system image,
2319
# if you need to run emulator(s) during your tests
24-
- sys-img-armeabi-v7a-android-19
25-
- sys-img-x86-android-17
20+
- sys-img-armeabi-v7a-android-21
2621

2722
# Emulator Management: Create, Start and Wait
2823
before_script:
29-
- echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
24+
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
3025
- emulator -avd test -no-skin -no-audio -no-window &
3126
- android-wait-for-emulator
3227
- adb shell input keyevent 82 &

app/build.gradle

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,22 @@ repositories {
1414
maven { url 'https://maven.fabric.io/public' }
1515
}
1616

17-
apply plugin: 'com.neenbedankt.android-apt'
18-
1917
android {
20-
compileSdkVersion 25
21-
buildToolsVersion '25.0.2'
18+
compileSdkVersion 26
19+
buildToolsVersion '26.0.2'
2220
defaultConfig {
2321
applicationId 'com.blogspot.e_kanivets.moneytracker'
2422
minSdkVersion 17
25-
targetSdkVersion 25
23+
targetSdkVersion 26
2624
versionCode 20
2725
versionName '1.8.3'
2826
}
2927
signingConfigs {
3028
releaseConfig {
31-
storeFile file('mt_keystore.jks');
32-
storePassword('moneytracker');
29+
storeFile file('mt_keystore.jks')
30+
storePassword('moneytracker')
3331
keyAlias 'moneytracker'
34-
keyPassword 'moneytracker';
32+
keyPassword 'moneytracker'
3533
}
3634
}
3735
buildTypes {
@@ -64,13 +62,13 @@ dependencies {
6462
compile fileTree(dir: 'libs', include: ['*.jar'])
6563

6664
compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
67-
transitive = true;
65+
transitive = true
6866
}
6967

70-
compile 'com.android.support:support-v4:25.1.0'
71-
compile 'com.android.support:appcompat-v7:25.1.0'
72-
compile 'com.android.support:design:25.1.0'
73-
compile 'com.jakewharton:butterknife:7.0.1' // View annotation bindings
68+
compile 'com.android.support:support-v4:26.1.0'
69+
compile 'com.android.support:appcompat-v7:26.1.0'
70+
compile 'com.android.support:design:26.1.0'
71+
compile 'com.jakewharton:butterknife:8.5.1' // View annotation bindings
7472
compile 'com.google.dagger:dagger:2.0.1' // Dependency injection tool
7573
compile 'com.github.PhilJay:MPAndroidChart:v2.2.4' // Charts
7674
compile 'com.jakewharton.timber:timber:4.1.2' // Advanced logging tool
@@ -82,6 +80,6 @@ dependencies {
8280
androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4'
8381
androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4'
8482
androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
85-
apt 'com.google.dagger:dagger-compiler:2.0.1'
83+
annotationProcessor 'com.google.dagger:dagger-compiler:2.0.1'
8684
provided 'org.glassfish:javax.annotation:10.0-b28'
8785
}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AboutActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import com.blogspot.e_kanivets.moneytracker.R;
77
import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
88

9-
import butterknife.Bind;
9+
import butterknife.BindView;
1010

1111
public class AboutActivity extends BaseBackActivity {
12-
@Bind(R.id.tv_about)
12+
@BindView(R.id.tv_about)
1313
TextView tvAbout;
1414

1515
@Override

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import javax.inject.Inject;
2525

26-
import butterknife.Bind;
26+
import butterknife.BindView;
2727

2828
public class ReportActivity extends BaseBackActivity {
2929
@SuppressWarnings("unused")
@@ -43,9 +43,9 @@ public class ReportActivity extends BaseBackActivity {
4343

4444
private ShortSummaryPresenter shortSummaryPresenter;
4545

46-
@Bind(R.id.spinner_currency)
46+
@BindView(R.id.spinner_currency)
4747
AppCompatSpinner spinnerCurrency;
48-
@Bind(R.id.exp_list_view)
48+
@BindView(R.id.exp_list_view)
4949
ExpandableListView expandableListView;
5050

5151
@Override

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import javax.inject.Inject;
1717

18-
import butterknife.Bind;
18+
import butterknife.BindView;
1919
import butterknife.OnClick;
2020
import butterknife.OnItemClick;
2121

@@ -32,7 +32,7 @@ public class AccountsActivity extends BaseBackActivity {
3232

3333
private AccountsSummaryPresenter summaryPresenter;
3434

35-
@Bind(R.id.list_view)
35+
@BindView(R.id.list_view)
3636
ListView listView;
3737

3838
@Override

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import javax.inject.Inject;
2222

23-
import butterknife.Bind;
23+
import butterknife.BindView;
2424

2525
public class AddAccountActivity extends BaseBackActivity {
2626
@SuppressWarnings("unused")
@@ -33,13 +33,13 @@ public class AddAccountActivity extends BaseBackActivity {
3333

3434
private IValidator<Account> accountValidator;
3535

36-
@Bind(R.id.content)
36+
@BindView(R.id.content)
3737
View contentView;
38-
@Bind(R.id.et_title)
38+
@BindView(R.id.et_title)
3939
EditText etTitle;
40-
@Bind(R.id.et_init_sum)
40+
@BindView(R.id.et_init_sum)
4141
EditText etInitSum;
42-
@Bind(R.id.spinner)
42+
@BindView(R.id.spinner)
4343
AppCompatSpinner spinner;
4444

4545
@Override

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/EditAccountActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import javax.inject.Inject;
1616

17-
import butterknife.Bind;
17+
import butterknife.BindView;
1818
import butterknife.OnClick;
1919

2020
public class EditAccountActivity extends BaseBackActivity {
@@ -26,11 +26,11 @@ public class EditAccountActivity extends BaseBackActivity {
2626

2727
private Account account;
2828

29-
@Bind(R.id.et_title)
29+
@BindView(R.id.et_title)
3030
EditText etTitle;
31-
@Bind(R.id.et_goal)
31+
@BindView(R.id.et_goal)
3232
EditText etGoal;
33-
@Bind(R.id.view_color)
33+
@BindView(R.id.view_color)
3434
View viewColor;
3535

3636
@Override

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import javax.inject.Inject;
2424

25-
import butterknife.Bind;
25+
import butterknife.BindView;
2626

2727
public class TransferActivity extends BaseBackActivity {
2828
@SuppressWarnings("unused")
@@ -37,15 +37,15 @@ public class TransferActivity extends BaseBackActivity {
3737

3838
private List<Account> accountList;
3939

40-
@Bind(R.id.content)
40+
@BindView(R.id.content)
4141
View contentView;
42-
@Bind(R.id.spinner_from)
42+
@BindView(R.id.spinner_from)
4343
AppCompatSpinner spinnerFrom;
44-
@Bind(R.id.spinner_to)
44+
@BindView(R.id.spinner_to)
4545
AppCompatSpinner spinnerTo;
46-
@Bind(R.id.et_from_amount)
46+
@BindView(R.id.et_from_amount)
4747
EditText etFromAmount;
48-
@Bind(R.id.et_to_amount)
48+
@BindView(R.id.et_to_amount)
4949
EditText etToAmount;
5050

5151
@Override

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.blogspot.e_kanivets.moneytracker.activity.exchange_rate.ExchangeRatesActivity;
1919
import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
2020

21-
import butterknife.Bind;
21+
import butterknife.BindView;
2222

2323
/**
2424
* Base implementation of {@link android.support.v7.app.AppCompatActivity} to encapsulate Navigation
@@ -35,9 +35,9 @@ public abstract class BaseDrawerActivity extends BaseActivity
3535
private static final int REQUEST_IMPORT_EXPORT = 4;
3636
protected static final int REQUEST_BACKUP = 5;
3737

38-
@Bind(R.id.drawer_layout)
38+
@BindView(R.id.drawer_layout)
3939
DrawerLayout drawer;
40-
@Bind(R.id.nav_view)
40+
@BindView(R.id.nav_view)
4141
protected NavigationView navigationView;
4242

4343
protected abstract void update();

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/ChartsActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import javax.inject.Inject;
2525

26-
import butterknife.Bind;
26+
import butterknife.BindView;
2727

2828
public class ChartsActivity extends BaseBackActivity {
2929

@@ -34,9 +34,9 @@ public class ChartsActivity extends BaseBackActivity {
3434
@Inject
3535
CurrencyController currencyController;
3636

37-
@Bind(R.id.tabs)
37+
@BindView(R.id.tabs)
3838
TabLayout tabLayout;
39-
@Bind(R.id.view_pager)
39+
@BindView(R.id.view_pager)
4040
ViewPager viewPager;
4141

4242
@Override

0 commit comments

Comments
 (0)