[RELEASE] Merge beta into master

.circleci/config.yml

@@ -106,8 +106,10 @@ jobs:
 
     environment:
       # GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"
-      GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false
-      JVM_OPTS: -Xmx4096m
+      # GRADLE_OPTS: -Xmx2048m -Dorg.gradle.daemon=false
+      # JVM_OPTS: -Xmx4096m
+      JAVA_OPTS: '-Xms512m -Xmx2g'
+      GRADLE_OPTS: '-Xmx3g -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx2g -XX:+HeapDumpOnOutOfMemoryError"'
       TERM: dumb
       BASH_ENV: "~/.nvm/nvm.sh"
 
@@ -133,7 +135,9 @@ jobs:
             cd android
 
             echo -e "" > ./gradle.properties
-            echo -e "android.enableAapt2=false" >> ./gradle.properties
+            # echo -e "android.enableAapt2=false" >> ./gradle.properties
+            echo -e "android.useAndroidX=true" >> ./gradle.properties
+            echo -e "android.enableJetifier=true" >> ./gradle.properties
 
             if [[ $KEYSTORE ]]; then
               echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
@@ -154,6 +158,7 @@ jobs:
       - run:
           name: Build Android App
           command: |
+            npx jetify
             cd android
             if [[ $KEYSTORE ]]; then
               ./gradlew bundleRelease

.eslintrc.js

@@ -46,6 +46,7 @@ module.exports = {
 		"jsx-quotes": [2, "prefer-single"],
 		"jsx-a11y/href-no-hash": 0,
 		"import/prefer-default-export": 0,
+		"import/no-cycle": 0,
 		"camelcase": 0,
 		"no-underscore-dangle": 0,
 		"no-return-assign": 0,

README.md

@@ -60,13 +60,10 @@ Readme will guide you on how to config.
 1) Jitsi integration
 2) Notification Preferences
 3) Two-way authentication
-4) Authentication via SAML
-5) Authentication via Custom OAuth
-6) Authentication via CAS
-7) Bugsnag
-8) Optional Analytics
-9) Typescript
-10) Prettier
+4) Bugsnag
+5) Optional Analytics
+6) Typescript
+7) Prettier
 
 ## Features
 | Feature                                                   	    | Status 	|
@@ -89,8 +86,8 @@ Readme will guide you on how to config.
 | Tablet Support                                                	| ❌    	|
 | Read receipt                                                  	| ✅    	|
 | Broadbast Channel                                             	| ✅    	|
-| Authentication via SAML                                       	| ❌    	|
-| Authentication via CAS                                        	| ❌    	|
+| Authentication via SAML                                       	| ✅    	|
+| Authentication via CAS                                        	| ✅    	|
 | Custom Fields on Signup                                       	| ✅    	|
 | Report message                                                	| ✅    	|
 | Theming                                                       	| ❌    	|
@@ -110,7 +107,7 @@ Readme will guide you on how to config.
 | Accessibility (Advanced)                                      	| ❌    	|
 | Authentication via Meteor                                     	| ❌    	|
 | Authentication via Wordpress                                  	| ❌    	|
-| Authentication via Custom OAuth                               	| ❌    	|
+| Authentication via Custom OAuth                               	| ✅    	|
 | Add user to the room                                          	| ✅    	|
 | Send message                                                  	| ✅    	|
 | Authentication via Email                                      	| ✅    	|