Fix issues with proguardv9.0.0beta3

Signed-off-by: Mario Danic <mario@lovelyhq.com>

5 files changed, 13 insertions, 8 deletions

diff --git a/.idea/misc.xml b/.idea/misc.xml
index f84585426..7bfef59df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 3ef578e32..ec1eb9ef6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,8 +47,8 @@ android {
     targetSdkVersion 29
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-    versionCode 138
-    versionName "9.0.0beta2"
+    versionCode 139
+    versionName "9.0.0beta3"
 
     flavorDimensions "default"
     renderscriptTargetApi 19
@@ -124,8 +124,8 @@ android {
     }
 
     release {
-      minifyEnabled true
-      shrinkResources true
+      minifyEnabled false
+      shrinkResources false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
   }
@@ -283,7 +283,7 @@ dependencies {
   implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
   implementation 'eu.davidea:flexible-adapter-livedata:1.0.0-b3'
   implementation 'com.otaliastudios:elements:0.3.7'
-  implementation 'org.webrtc:google-webrtc:1.0.23295'
+  implementation 'org.webrtc:google-webrtc:1.0.23995'
   implementation 'com.yarolegovich:lovely-dialog:1.1.0'
   implementation 'com.yarolegovich:lovelyinput:1.0.9'
   implementation 'com.yarolegovich:mp:1.0.9'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b424510..9480f5240 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keep class org.webrtc.** { *; }
+-keep class com.nextcloud.talk.**  { *; }
+-keepclasseswithmembernames class * { native <methods>; }
+-keep class de.tavendo.autobahn.**  { *; }
+-keep class org.appspot.apprtc.**  { *; }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c1fe21459..ef03d4836 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-alpha08'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dd67b0836..53893e497 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip