From c3260a3fd7fe25ef029f1198941a5ff7698d2822 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 27 Feb 2020 13:07:11 -0800
Subject: [PATCH] minor fixes to work with virgin build trees

---
 .idea/compiler.xml                       | 9 +++++++++
 .idea/gradle.xml                         | 2 +-
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 settings.gradle                          | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 .idea/compiler.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..88c27cdd3
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="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 17c82e9bc..9e4218b08 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,9 +10,9 @@
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$/../../geeksville-androidlib" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/../geeksville-androidlib" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/build.gradle b/build.gradle
index 1926416c9..54afb3caf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0-alpha09'
+        classpath 'com.android.tools.build:gradle:4.1.0-alpha01'
         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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 569a73541..be5f8b888 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 21 19:05:09 PST 2020
+#Thu Feb 27 12:08:19 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
diff --git a/settings.gradle b/settings.gradle
index c4af70bf3..79231d2cb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,4 +2,4 @@ include ':app'
 rootProject.name='Mesh Util'
 
 include ':geeksville-androidlib'
-project(':geeksville-androidlib').projectDir = new File('/home/kevinh/development/geeksville-androidlib')
\ No newline at end of file
+project(':geeksville-androidlib').projectDir = new File('../geeksville-androidlib')