From a6afe04e69a912d7224c4809faef2d4b9a979bfc Mon Sep 17 00:00:00 2001 From: Azizur Rahman Date: Thu, 6 Oct 2016 14:32:54 -0700 Subject: [PATCH 1/3] Fixed the package link error --- app/src/main/res/layout/fragment_meals.xml | 2 +- app/src/main/res/layout/fragment_shopping_lists.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_meals.xml b/app/src/main/res/layout/fragment_meals.xml index 25654fd..f51b380 100755 --- a/app/src/main/res/layout/fragment_meals.xml +++ b/app/src/main/res/layout/fragment_meals.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/grey" - tools:context=".MealsFragment"> + tools:context=".ui.meals.MealsFragment"> + tools:context="ui.activeLists.ShoppingListsFragment"> Date: Thu, 6 Oct 2016 14:34:17 -0700 Subject: [PATCH 2/3] Updated dependencies with latest version --- app/build.gradle | 23 ++++++++++++++--------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 979a9ad..e907e5c 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion 24 + buildToolsVersion"24.0.3" defaultConfig { applicationId "com.udacity.firebase.shoppinglistplusplus" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 1 versionName "1.0" } @@ -25,12 +25,17 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.1' - compile 'com.android.support:design:23.0.1' - compile 'com.android.support:support-v4:23.0.1' - compile 'com.android.support:cardview-v7:23.0.1' + + compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:design:24.2.1' + compile 'com.android.support:support-v4:24.2.1' + compile 'com.android.support:cardview-v7:24.2.1' + /* For Google Play Services */ - compile 'com.google.android.gms:play-services-safetynet:8.3.0' - compile 'com.google.android.gms:play-services-auth:8.3.0' + //compile 'com.google.android.gms:play-services-safetynet:8.3.0' + //compile 'com.google.android.gms:play-services-auth:8.3.0' + + compile 'com.google.android.gms:play-services:9.6.1' + compile 'com.google.android.gms:play-services:9.6.1' } diff --git a/build.gradle b/build.gradle index c6371d6..b193299 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.1' + classpath 'com.android.tools.build:gradle:2.2.0' // 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 0c71e76..a6257a5 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Thu Oct 06 13:44:06 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip From 00d33e703c993eb62cad420e3e892fb828bbcf24 Mon Sep 17 00:00:00 2001 From: Azizur Rahman Date: Thu, 6 Oct 2016 14:38:03 -0700 Subject: [PATCH 3/3] Updated build gradle --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e907e5c..a688567 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,9 +33,6 @@ dependencies { /* For Google Play Services */ - //compile 'com.google.android.gms:play-services-safetynet:8.3.0' - //compile 'com.google.android.gms:play-services-auth:8.3.0' - compile 'com.google.android.gms:play-services:9.6.1' compile 'com.google.android.gms:play-services:9.6.1' }