Skip to content

Commit 8a3f7b9

Browse files
committed
Update dependencies and tools
This fixes the Moshi bug not allowing slashes to be escaped.
1 parent 9207753 commit 8a3f7b9

33 files changed

Lines changed: 44 additions & 44 deletions

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
ext.support_version = '24.2.0'
2+
ext.support_version = '25.0.0'
33
ext.support_test_version = '0.5'
4-
ext.build_tools_version = '24.0.2'
4+
ext.build_tools_version = '25.0.0'
55
ext.okhttp_version = '3.4.1'
66

77
repositories {
88
jcenter()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:2.2.1'
11+
classpath 'com.android.tools.build:gradle:2.2.2'
1212
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1313
}
1414
}

circle.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ dependencies:
88
cache_directories:
99
- /usr/local/android-sdk-linux/extras/android/m2repository
1010
- /usr/local/android-sdk-linux/extras/google/m2repository
11-
- /usr/local/android-sdk-linux/platforms/android-24
12-
- /usr/local/android-sdk-linux/build-tools/24.0.3
11+
- /usr/local/android-sdk-linux/platforms/android-25
12+
- /usr/local/android-sdk-linux/build-tools/25.0.0
1313
- /usr/local/android-sdk-linux/platform-tools
1414
pre:
15-
- if [ $(grep -q "Revision=38.0.0" $ANDROID_HOME/extras/android/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" ; fi
16-
- if [ $(grep -q "Revision=36" $ANDROID_HOME/extras/google/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-google-m2repository" ; fi
17-
- if [ ! -e $ANDROID_HOME/platforms/android-24 ] ; then echo y | android update sdk --no-ui --all --filter "android-24" ; fi
18-
- if [ ! -e $ANDROID_HOME/build-tools/24.0.3 ] ; then echo y | android update sdk --no-ui --all --filter "build-tools-24.0.3" ; fi
19-
- if [ $(grep -q "Revision=24.0.4" $ANDROID_HOME/platform-tools/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "platform-tools" ; fi
15+
- if [ $(grep -q "Revision=39.0.0" $ANDROID_HOME/extras/android/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" ; fi
16+
- if [ $(grep -q "Revision=38" $ANDROID_HOME/extras/google/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-google-m2repository" ; fi
17+
- if [ ! -e $ANDROID_HOME/platforms/android-25 ] ; then echo y | android update sdk --no-ui --all --filter "android-25" ; fi
18+
- if [ ! -e $ANDROID_HOME/build-tools/25.0.0 ] ; then echo y | android update sdk --no-ui --all --filter "build-tools-25.0.0" ; fi
19+
- if [ $(grep -q "Revision=25.0.0" $ANDROID_HOME/platform-tools/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "platform-tools" ; fi
2020
override:
2121
- ./gradlew dependencies -Dorg.gradle.daemon=false --console=plain
2222

library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
44
group = 'com.github.proxer'
55

66
android {
7-
compileSdkVersion 24
8-
buildToolsVersion '24.0.3'
7+
compileSdkVersion 25
8+
buildToolsVersion '25.0.0'
99

1010
defaultConfig {
1111
minSdkVersion 14
12-
targetSdkVersion 24
12+
targetSdkVersion 25
1313
versionCode 41
1414
versionName "2.1.1"
1515
consumerProguardFiles 'proguard-rules.pro'
@@ -24,7 +24,7 @@ android {
2424

2525
dependencies {
2626
compile "com.android.support:support-annotations:$support_version"
27-
compile 'com.squareup.moshi:moshi:1.3.0'
27+
compile 'com.squareup.moshi:moshi:1.3.1'
2828
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
2929
compile 'com.github.franmontiel:PersistentCookieJar:v1.0.0'
3030

library/src/main/java/com/proxerme/library/connection/info/request/CommentRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public CommentRequest withSortType(@CommentSortParameter.CommentSort String sort
9292
@Override
9393
protected ProxerResult<Comment[]> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
9494
throws IOException {
95-
return moshi.adapter(CommentResult.class).lenient().fromJson(convertBody(body.string()));
95+
return moshi.adapter(CommentResult.class).fromJson(convertBody(body.string()));
9696
}
9797

9898
@NonNull

library/src/main/java/com/proxerme/library/connection/info/request/EntryCoreRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public EntryCoreRequest(@NonNull String id) {
3939
@Override
4040
protected ProxerResult<EntryCore> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4141
throws IOException {
42-
return moshi.adapter(EntryCoreResult.class).lenient().fromJson(body.source());
42+
return moshi.adapter(EntryCoreResult.class).fromJson(body.source());
4343
}
4444

4545
@NonNull

library/src/main/java/com/proxerme/library/connection/info/request/EntryRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public EntryRequest(@NonNull String id) {
3939
@Override
4040
protected ProxerResult<Entry> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4141
throws IOException {
42-
return moshi.adapter(EntryResult.class).lenient().fromJson(body.source());
42+
return moshi.adapter(EntryResult.class).fromJson(body.source());
4343
}
4444

4545
@NonNull

library/src/main/java/com/proxerme/library/connection/info/request/ListInfoRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public ListInfoRequest withLimit(@IntRange(from = 1) int limit) {
5959
@Override
6060
protected ProxerResult<ListInfo> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
6161
throws IOException {
62-
return moshi.adapter(ListInfoResult.class).lenient().fromJson(body.source());
62+
return moshi.adapter(ListInfoResult.class).fromJson(body.source());
6363
}
6464

6565
@NonNull

library/src/main/java/com/proxerme/library/connection/info/request/RelationRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public RelationRequest(@NonNull String id) {
3838
@Override
3939
protected ProxerResult<Relation[]> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4040
throws IOException {
41-
return moshi.adapter(RelationResult.class).lenient().fromJson(body.source());
41+
return moshi.adapter(RelationResult.class).fromJson(body.source());
4242
}
4343

4444

library/src/main/java/com/proxerme/library/connection/info/request/SeasonRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public SeasonRequest(@NonNull String id) {
3838
@Override
3939
protected ProxerResult<Season[]> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4040
throws IOException {
41-
return moshi.adapter(SeasonResult.class).lenient().fromJson(body.source());
41+
return moshi.adapter(SeasonResult.class).fromJson(body.source());
4242
}
4343

4444
@NonNull

library/src/main/java/com/proxerme/library/connection/info/request/SetUserInfoRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public SetUserInfoRequest(@NonNull String id, @ViewStateParameter.ViewState Stri
4646
@Override
4747
protected ProxerResult<Void> parse(@NonNull Moshi moshi, @NonNull ResponseBody body)
4848
throws IOException {
49-
return moshi.adapter(SetUserInfoResult.class).lenient().fromJson(body.source());
49+
return moshi.adapter(SetUserInfoResult.class).fromJson(body.source());
5050
}
5151

5252
@NonNull

0 commit comments

Comments
 (0)