TouchInstinct
/
android-templates
309
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master-rx-java-2 

# Conflicts:
#	src/main/java/ru/touchin/templates/chat/Chat.java
This commit is contained in:
gorodeckii 2017-07-13 16:33:03 +03:00
parent c79a77f52a e1dfde7b0c
commit e0f57761e7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -28,8 +28,8 @@ dependencies {
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'io.reactivex.rxjava2:rxjava:2.1.1'
provided 'com.android.support:appcompat-v7:25.3.1'
provided 'com.android.support:recyclerview-v7:25.3.1'
provided 'com.android.support:appcompat-v7:25.4.0'
provided 'com.android.support:recyclerview-v7:25.4.0'
provided 'com.squareup.retrofit2:retrofit:2.3.0'
provided('com.google.http-client:google-http-client-jackson2:1.22.0') {
@ -41,11 +41,11 @@ dependencies {
provided 'com.scottyab:aes-crypto:0.0.4'
provided('io.socket:socket.io-client:0.8.3') {
provided('io.socket:socket.io-client:0.9.0') {
exclude group: 'org.json', module: 'json'
}
provided('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
provided('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
transitive = true;
}

2
src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java
View File

@ -62,7 +62,7 @@ public class LoganSquareEnumConverter<T extends Enum & LoganSquareEnum> extends
if (defaultValue != null) {
return defaultValue;
}
throw new ShouldNotHappenException();
throw new ShouldNotHappenException("Enum parsing exception for value: " + string);
}
@Nullable