Update to include development branch changes

app/build.gradle

@@ -90,6 +90,7 @@ repositories {
     // Added the custom Maven repository for utilcode
     maven {
         url 'http://maven.xdja.com:8081/nexus3/repository/aliyun/'
+        allowInsecureProtocol = true
     }
 }
 

app/src/main/java/cmu/xprize/robotutor/tutorengine/CMediaManager.java

@@ -246,7 +246,7 @@ public String mapSoundPackage(CTutor tTutor, String packageName, String langOver
         catch(Exception e) {
             soundPackage = autoLang;
         }
-
+        Log.d(TAG, "Resolved soundPackage = " + soundPackage);
         return soundPackage;
     }
 
@@ -285,7 +285,7 @@ public String mapPackagePath(CTutor tTutor, String packageName) {
         catch(Exception e) {
             packagePath = TCONST.BASE_ASSETS;
         }
-
+        Log.d(TAG, "Resolved packagePath = " + packagePath);
         return packagePath;
     }
 
@@ -324,7 +324,7 @@ public String mapPackageLocation(CTutor tTutor, String packageName) {
         catch(Exception e) {
             packageLocation = TCONST.EXTERNAL;
         }
-
+        Log.d(TAG, "Resolved packageLocation = " + packageLocation);
         return packageLocation;
     }
 

gradle.properties

@@ -12,7 +12,7 @@
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 android.enableJetifier=true
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 --add-opens java.base/java.io=ALL-UNNAMED
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Jan 02 13:34:20 IST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip