diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1bd955209..551d479b0 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -5,6 +5,8 @@
       <module name="app" target="1.8" />
       <module name="geeksville-androidlib" target="1.7" />
       <module name="Mesh Util-geeksville-androidlib" target="1.7" />
+      <module name="Mesh_Util.app" target="1.8" />
+      <module name="Mesh_Util.geeksville-androidlib" target="1.7" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 54874b2cf..dba811c87 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,6 +16,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/build.gradle b/build.gradle
index c40721560..c8ed30bba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-alpha01'
+        classpath 'com.android.tools.build:gradle:4.1.0-alpha04'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/geeksville-androidlib b/geeksville-androidlib
index 669bc3fbb..65f39f90c 160000
--- a/geeksville-androidlib
+++ b/geeksville-androidlib
@@ -1 +1 @@
-Subproject commit 669bc3fbb54ffaef3db086d1a756489b781fb2a0
+Subproject commit 65f39f90ce365263620d5f9cbddca0c8abebcf9a
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be5f8b888..eb5bc3dcd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 27 12:08:19 PST 2020
+#Sun Mar 29 11:25:06 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-1-bin.zip