Skip to content

Commit 81c67d6

Browse files
Iván Carballohitherejoe
authored andcommitted
Update dependencies and move to SDK version 24 (ribot#46)
* Robolectric to version 3.1 * Robolectric emulate SDK to API level 23 * Move to SDK version 24 (Android N) and support library 24.0.0 * Play Services to 9.2.0 * Small version update for Retrofit, Butterknife, RxAndroid, RxJava, Timber and Crashlytics. * Update requirements section README
1 parent 640cdaa commit 81c67d6

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ Libraries and tools included:
2121

2222
## Requirements
2323

24+
- JDK 1.8
2425
- [Android SDK](http://developer.android.com/sdk/index.html).
25-
- Android [6.0 (API 23) ](http://developer.android.com/tools/revisions/platforms.html#6.0).
26+
- Android N [(API 24) ](http://developer.android.com/tools/revisions/platforms.html).
2627
- Latest Android SDK Tools and build tools.
2728

2829

app/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ apply plugin: 'com.neenbedankt.android-apt'
66
//apply plugin: 'io.fabric'
77

88
android {
9-
compileSdkVersion 23
10-
buildToolsVersion '23.0.3'
9+
compileSdkVersion 24
10+
buildToolsVersion '24'
1111

1212
defaultConfig {
1313
applicationId 'uk.co.ribot.androidboilerplate'
1414
minSdkVersion 16
15-
targetSdkVersion 23
15+
targetSdkVersion 24
1616
testInstrumentationRunner "${applicationId}.runner.RxAndroidJUnitRunner"
1717
versionCode 1000
1818
// Major -> Millions, Minor -> Thousands, Bugfix -> Hundreds. E.g 1.3.72 == 1,003,072
@@ -79,15 +79,15 @@ play {
7979
}
8080

8181
dependencies {
82-
final PLAY_SERVICES_VERSION = '8.4.0'
83-
final SUPPORT_LIBRARY_VERSION = '23.4.0'
84-
final RETROFIT_VERSION = '2.0.0'
82+
final PLAY_SERVICES_VERSION = '9.2.0'
83+
final SUPPORT_LIBRARY_VERSION = '24.0.0'
84+
final RETROFIT_VERSION = '2.1.0'
8585
final DAGGER_VERSION = '2.4'
8686
final DEXMAKER_VERSION = '1.4'
8787
final HAMCREST_VERSION = '1.3'
8888
final ESPRESSO_VERSION = '2.2.1'
8989
final RUNNER_VERSION = '0.4'
90-
final BUTTERKNIFE_VERSION = '8.0.1'
90+
final BUTTERKNIFE_VERSION = '8.1.0'
9191
final AUTO_VALUE_VERSION = '1.2'
9292

9393
def daggerCompiler = "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
@@ -107,13 +107,13 @@ dependencies {
107107
compile "com.squareup.retrofit2:adapter-rxjava:$RETROFIT_VERSION"
108108

109109
compile 'com.github.bumptech.glide:glide:3.7.0'
110-
compile 'io.reactivex:rxandroid:1.1.0'
111-
compile 'io.reactivex:rxjava:1.1.4'
112-
compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') {
110+
compile 'io.reactivex:rxandroid:1.2.1'
111+
compile 'io.reactivex:rxjava:1.1.6'
112+
compile('com.crashlytics.sdk.android:crashlytics:2.5.7@aar') {
113113
transitive = true;
114114
}
115115

116-
compile 'com.jakewharton.timber:timber:4.1.0'
116+
compile 'com.jakewharton.timber:timber:4.1.2'
117117
compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
118118
apt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
119119

@@ -153,7 +153,7 @@ dependencies {
153153
testCompile "org.hamcrest:hamcrest-core:$HAMCREST_VERSION"
154154
testCompile "org.hamcrest:hamcrest-library:$HAMCREST_VERSION"
155155
testCompile "org.hamcrest:hamcrest-integration:$HAMCREST_VERSION"
156-
testCompile 'org.robolectric:robolectric:3.0'
156+
testCompile 'org.robolectric:robolectric:3.1'
157157
}
158158

159159
// Log out test results to console

app/src/test/java/uk/co/ribot/androidboilerplate/util/DefaultConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
*/
66
public class DefaultConfig {
77
//The api level that Roboelectric will use to run the unit tests
8-
public static final int EMULATE_SDK = 21;
8+
public static final int EMULATE_SDK = 23;
99
}

0 commit comments

Comments
 (0)