diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 index 03901a90..a71c2416 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,16 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.example.android.mygarden" minSdkVersion 15 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true } buildTypes { release { @@ -20,9 +21,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.2.0' - compile 'com.android.support:design:25.2.0' - compile 'com.android.support:recyclerview-v7:25.2.0' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:recyclerview-v7:27.1.1' + implementation 'com.android.support.constraint:constraint-layout:1.1.0' } diff --git a/app/src/main/java/com/example/android/mygarden/ui/PlantListAdapter.java b/app/src/main/java/com/example/android/mygarden/ui/PlantListAdapter.java old mode 100644 new mode 100755 index 484a909f..ffaef759 --- a/app/src/main/java/com/example/android/mygarden/ui/PlantListAdapter.java +++ b/app/src/main/java/com/example/android/mygarden/ui/PlantListAdapter.java @@ -82,7 +82,7 @@ public void onBindViewHolder(PlantViewHolder holder, int position) { } public void swapCursor(Cursor newCursor) { - if (mCursor != null) { + if (mCursor != null && mCursor != newCursor) { mCursor.close(); } mCursor = newCursor; diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 74b2ab0d..44bac8f9 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f3..31fc30eb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sat May 19 10:38:41 CDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip