Skip to content

Commit 361d96f

Browse files
authored
Merge pull request #147 from brarcher/sdk-27
Update to SDK 27
2 parents 1842304 + 466715f commit 361d96f

File tree

6 files changed

+11
-13
lines changed

6 files changed

+11
-13
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ install:
55
- echo y | android update sdk -u -a -t tools
66
- echo y | android update sdk -u -a -t platform-tools
77
- echo y | android update sdk -u -a -t build-tools-26.0.2
8-
- echo y | android update sdk -u -a -t android-25
8+
- yes | sdkmanager "platforms;android-27"
99
- echo y | android update sdk -u -a -t extra-google-m2repository
1010
- echo y | android update sdk -u -a -t extra-android-m2repository
1111

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ findbugs {
77
}
88

99
android {
10-
compileSdkVersion 25
10+
compileSdkVersion 27
1111

1212
defaultConfig {
1313
applicationId "protect.budgetwatch"
1414
minSdkVersion 14
15-
targetSdkVersion 25
15+
targetSdkVersion 27
1616
versionCode 23
1717
versionName "0.20"
1818
}
@@ -47,13 +47,13 @@ android {
4747

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

app/src/test/java/protect/budgetwatch/BudgetViewActivityTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ private ActivityController setupActivity(final String budget, int value,
8080

8181
intent.putExtras(bundle);
8282

83-
ActivityController activityController = Robolectric.buildActivity(BudgetViewActivity.class)
84-
.withIntent(intent).create();
83+
ActivityController activityController = Robolectric.buildActivity(BudgetViewActivity.class, intent).create();
8584

8685
Activity activity = (Activity)activityController.get();
8786
DBHelper db = new DBHelper(activity);

app/src/test/java/protect/budgetwatch/ReceiptViewActivityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void setUp()
3838
intent.putExtras(bundle);
3939

4040
activityController = Robolectric.buildActivity(
41-
ReceiptViewActivity.class).withIntent(intent).create();
41+
ReceiptViewActivity.class, intent).create();
4242
}
4343

4444
@Test

app/src/test/java/protect/budgetwatch/TransactionViewActivityTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,7 @@ private ActivityController setupActivity(final String budget, final String recei
377377

378378
intent.putExtras(bundle);
379379

380-
ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class)
381-
.withIntent(intent).create();
380+
ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class, intent).create();
382381

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

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

415-
ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class)
416-
.withIntent(intent).create();
414+
ActivityController activityController = Robolectric.buildActivity(TransactionViewActivity.class, intent).create();
417415

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

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ allprojects {
1919
repositories {
2020
jcenter()
2121
maven { url 'https://jitpack.io' }
22+
google()
2223
}
2324
}
2425

0 commit comments

Comments
 (0)