Merge pull request #241 from ZeusWPI/update-and-fix

Small tweaks
ZeusWPI · Dec 6, 2017 · 47ec416 · 47ec416
2 parents 6776ff5 + a71b45a
commit 47ec416
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -98,8 +98,8 @@ project.afterEvaluate {
 
 //The support library version
 final SUPPORT_LIBRARY_VERSION = '26.1.0'
-final GMS_VERSION = '11.4.0'
-final AAC_VERSION = '1.0.0-rc1'
+final GMS_VERSION = '11.6.2'
+final AAC_VERSION = '1.0.0'
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
@@ -165,9 +165,9 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.7.20'
 
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 
     //Enable the normal library for unit tests
     testCompile ('org.threeten:threetenbp:1.3.2'){

diff --git a/app/src/main/res/layout/activity_extra_food.xml b/app/src/main/res/layout/activity_extra_food.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:id="@+id/app_bar_layout">
 
-        <include layout="@layout/x_toolbar_no_scroll" />
+        <include layout="@layout/x_toolbar" />
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab_layout"

diff --git a/firebasenoop/build.gradle b/firebasenoop/build.gradle
@@ -6,8 +6,8 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionName "11.4.0"
-        versionCode 1140
+        versionName "11.6.2"
+        versionCode 1162
 
         consumerProguardFiles 'proguard-rules.pro'
     }
@@ -16,7 +16,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile ('com.google.firebase:firebase-core:11.4.0') {
+    compile ('com.google.firebase:firebase-core:11.6.2') {
         exclude module:'support-v4'
     }
 }