Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ install:
- echo y | android update sdk -u -a -t tools
- echo y | android update sdk -u -a -t platform-tools
- echo y | android update sdk -u -a -t build-tools-26.0.2
- echo y | android update sdk -u -a -t android-25
- yes | sdkmanager "platforms;android-27"
- echo y | android update sdk -u -a -t extra-google-m2repository
- echo y | android update sdk -u -a -t extra-android-m2repository

Expand Down
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ findbugs {
}

android {
compileSdkVersion 25
compileSdkVersion 27

defaultConfig {
applicationId "protect.budgetwatch"
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 23
versionName "0.20"
}
Expand Down Expand Up @@ -47,13 +47,13 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:appcompat-v7:27.0.2'
compile 'com.android.support:design:27.0.2'
compile 'org.apache.commons:commons-csv:1.5'
compile group: 'com.google.guava', name: 'guava', version: '20.0'
compile 'com.github.apl-devs:appintro:v4.2.0'
testCompile 'junit:junit:4.12'
testCompile "org.robolectric:robolectric:3.4.2"
testCompile "org.robolectric:robolectric:3.7"
testCompile group: 'org.javatuples', name: 'javatuples', version: '1.2'
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ private ActivityController setupActivity(final String budget, int value,

intent.putExtras(bundle);

ActivityController activityController = Robolectric.buildActivity(BudgetViewActivity.class)
.withIntent(intent).create();
ActivityController activityController = Robolectric.buildActivity(BudgetViewActivity.class, intent).create();

Activity activity = (Activity)activityController.get();
DBHelper db = new DBHelper(activity);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void setUp()
intent.putExtras(bundle);

activityController = Robolectric.buildActivity(
ReceiptViewActivity.class).withIntent(intent).create();
ReceiptViewActivity.class, intent).create();
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,7 @@ private ActivityController setupActivity(final String budget, final String recei

intent.putExtras(bundle);

ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class)
.withIntent(intent).create();
ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class, intent).create();

Activity activity = (Activity)activityController.get();

Expand Down Expand Up @@ -412,8 +411,7 @@ private ActivityController setupActivity(final int actionType, final String budg
intent.setAction(TransactionViewActivity.ACTION_NEW_REVENUE);
}

ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class)
.withIntent(intent).create();
ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class, intent).create();

Activity activity = (Activity)activityController.get();

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ allprojects {
repositories {
jcenter()
maven { url 'https://jitpack.io' }
google()
}
}

Expand Down