Finishing release 8.0

Merge branch 'release-8.0'
unfoldingWord-dev · May 31, 2016 · 0458e4e · 0458e4e
2 parents f4d71b9 + c1a3e16
commit 0458e4e
Show file tree

Hide file tree

Showing 98 changed files with 24,024 additions and 626 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,13 +19,14 @@ android {
         applicationId "com.translationstudio.androidapp"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 128
-        versionName "7.0"
+        versionCode 137
+        versionName "8.0"
         multiDexEnabled = true
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     dexOptions {
         incremental true
-        javaMaxHeapSize "4g"
+        javaMaxHeapSize "5g"
     }
     buildTypes {
         release {
@@ -68,8 +69,20 @@ dependencies {
     compile 'org.apmem.tools:layouts:1.10'
     compile 'com.itextpdf:itextpdf:5.5.7'
     compile 'com.facebook.rebound:rebound:0.3.8'
-    compile 'org.unfoldingword.tools:gogs-client:1.3.4'
+    compile 'org.unfoldingword.tools:gogs-client:1.6.0'
     compile project(':html-textview')
     compile project(':com.door43.tools.reporting')
     compile project(':com.door43.tools.security')
+    compile 'com.google.android.gms:play-services-appindexing:8.1.0'
+
+    androidTestCompile 'com.android.support:support-annotations:23.1.1'
+    androidTestCompile 'com.android.support.test:runner:0.4.1'
+    androidTestCompile 'com.android.support.test:rules:0.4.1'
+    // Optional -- Hamcrest library
+    androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
+//    // Optional -- UI testing with Espresso
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
+//    // Optional -- UI testing with UI Automator
+//    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
+
 }