Skip to content

Commit cba35c4

Browse files
author
Karl Rieb
committed
Update ChangeLog and fix ProGuard rules to not warn on optional Google App Engine dependencies.
1 parent 2b775ed commit cba35c4

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

‎ChangeLog.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
---------------------------------------------
33
- Allow old locale formats for APIv2 requests.
44
- Fix ExceptionInInitializationError caused by CertificateParsingException when using Java 6 JREs.
5-
- Update OkHttp dependency to OkHttp3
5+
- Add support for OkHttp3.
6+
- Add support for Google App Engine with new GoogleAppEngineRequestor.
67

78
2.0.4 (2016-05-31)
89
---------------------------------------------

‎examples/android/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ dependencies {
6363
compile 'com.android.support:recyclerview-v7:23.1.1'
6464
compile 'com.fasterxml.jackson.core:jackson-core:2.7.4'
6565
// picasso 2.5.2 doesn't have OkHttp3 support (although it exists on master). Must use both
66-
// OkHttp v2 and v3 until new picasso release.
66+
// OkHttp v2 until new picasso release
6767
compile 'com.squareup.picasso:picasso:2.5.2'
6868
compile 'com.squareup.okhttp:okhttp:2.7.5'
69-
compile 'com.squareup.okhttp3:okhttp:3.3.1'
7069
}
7170

7271
apply plugin: 'com.getkeepsafe.dexcount'

‎examples/android/proguard-rules.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
# OkHttp and Servlet optional dependencies
2020

2121
-dontwarn okio.**
22+
-dontwarn okhttp3.**
23+
-dontwarn com.google.appengine.**
2224
-dontwarn javax.servlet.**
2325

2426
# Support classes for compatibility with older API versions

‎proguard/src/main/resources/proguard/application-rules.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
-keepattributes SourceFile,LineNumberTable
33

44
-dontwarn okhttp3.**
5+
-dontwarn com.squareup.okhttp.**
6+
-dontwarn com.google.appengine.**
57
-dontwarn com.dropbox**.android.**
68
-dontwarn org.testng.**
79
-dontwarn bsh.**

0 commit comments

Comments
 (0)