Merge pull request #220 from apptentive/branch_5.6.2

Release 5.6.2
apptentive · Jan 29, 2021 · 758a8cd · 758a8cd
2 parents 189503c + e492f45
commit 758a8cd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2021-01-28 - v5.6.2
+
+#### Fixes
+
+* Google Play Core library ProGuard fixes.
+
 # 2021-01-04 - v5.6.1
 
 #### Improvements

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ use your app, to talk to them at the right time, and in the right way.
 
 ##### [Release Notes](https://learn.apptentive.com/knowledge-base/android-sdk-release-notes/)
 
-##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|5.6.1|aar)
+##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|5.6.2|aar)
 
 #### Reporting Bugs
 

diff --git a/apptentive/consumer-proguard-rules.pro b/apptentive/consumer-proguard-rules.pro
@@ -12,8 +12,9 @@
 -keep class * implements com.apptentive.android.sdk.serialization.SerializableObject { *; }
 -keep class com.apptentive.android.sdk.** implements java.io.Serializable { *; }
 
-
 -keep class android.os.Build { *; }
 -keep class android.graphics.Typeface { *; }
 -keep class androidx.fragment.app.Fragment { *; }
 -keep class androidx.fragment.app.FragmentManagerImpl { *; }
+
+-keep class com.google.android.play.core.review.** { *; }
diff --git a/apptentive/src/main/java/com/apptentive/android/sdk/conversation/ConversationMetadata.java b/apptentive/src/main/java/com/apptentive/android/sdk/conversation/ConversationMetadata.java
@@ -4,7 +4,6 @@
 import com.apptentive.android.sdk.util.StringUtils;
 
 import java.io.DataInput;
-import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -131,6 +130,10 @@ private static void hackR8() {
 				// touch the constructor and "use" the reference
 				ConversationMetadata c = new ConversationMetadata(stream);
 				System.out.println(c);
+
+				// some R8 configurations also remove google in-app review library classes
+				com.google.android.play.core.review.ReviewManager factory = com.google.android.play.core.review.ReviewManagerFactory.create(null);
+				System.out.println(factory);
 			}
 		} catch (Exception ignored) {
 		}

diff --git a/apptentive/src/main/java/com/apptentive/android/sdk/util/Constants.java b/apptentive/src/main/java/com/apptentive/android/sdk/util/Constants.java
@@ -9,7 +9,7 @@
 public class Constants {
 
 	public static final int API_VERSION = 10;
-	private static final String APPTENTIVE_SDK_VERSION = "5.6.1";
+	private static final String APPTENTIVE_SDK_VERSION = "5.6.2";
 
 	public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 45000;
 	public static final int DEFAULT_READ_TIMEOUT_MILLIS = 45000;