Merge branch 'master' into lite

# Conflicts: # library/build.gradle
modular-ftc · Jan 15, 2019 · 416df65 · 416df65
2 parents 439ea7e + 597bb71
commit 416df65
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -8,15 +8,19 @@ android {
         targetSdkVersion 19
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        versionCode 29
-        versionName "$ftc_version.0-lite"
+        versionCode 30
+        versionName "$ftc_version.1-lite"
 
         ndk {
             abiFilters "armeabi-v7a"
         }
 
         consumerProguardFiles 'proguard-rules.pro'
     }
+
+    aaptOptions {
+        noCompress "tflite"
+    }
 }
 
 group = 'com.github.Pattonville-Robotics'