diff --git a/app/build.gradle b/app/build.gradle
index 833c77e86..f38df8802 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,8 +55,8 @@ android {
             signingConfig signingConfigs.debug
         }
         release {
-            minifyEnabled true
-            shrinkResources true
+            minifyEnabled false
+            shrinkResources false
             proguardFiles getDefaultProguardFile ('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 30701719c..f96e2e185 100755
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -4,6 +4,8 @@
 -dontnote **
 -dontobfuscate
 
+-keep class javax.** { *; }
+
 # keep javac classes
 -keep class com.sun.** { *; }
 
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 0e4671502..c59de6dd5 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 202,
+      "versionCode": 211,
       "versionName": "2.1.1-beta",
       "outputFile": "app-release.apk"
     }
diff --git a/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar b/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar
index 130cbb70d..a3f4ba8fa 100644
Binary files a/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar and b/build-tools/tooling-api-impl/src/test/test-home/.androidide/init/model.jar differ