From 85dfe0b178a5c5ab31fc0d3ef0d7f6ddb7f265ec Mon Sep 17 00:00:00 2001 From: Paulo Linhares Date: Fri, 14 Sep 2018 11:42:50 -0300 Subject: [PATCH] Updated Gradle version for 4.4, Gradle plugin for 3.1.4, BuildTools for 27 --- .idea/caches/build_file_checksums.ser | Bin 0 -> 543 bytes .idea/codeStyles/Project.xml | 29 ++++++++++ .idea/gradle.xml | 18 +++++++ .idea/misc.xml | 34 ++++++++++++ .idea/modules.xml | 9 ++++ .idea/runConfigurations.xml | 12 +++++ .idea/runConfigurations/Step_1___Dao.xml | 51 ------------------ .idea/runConfigurations/Step_1___Solution.xml | 51 ------------------ .../Step_2___Relationships.xml | 51 ------------------ .../Step_3___Async_calls.xml | 51 ------------------ .idea/runConfigurations/Step_3___Solution.xml | 51 ------------------ .idea/runConfigurations/Step_4___Solution.xml | 51 ------------------ .../Step_4___Type_converters.xml | 51 ------------------ .../Step_5___Custom_Results.xml | 51 ------------------ .idea/runConfigurations/Step_5___Solution.xml | 51 ------------------ .idea/vcs.xml | 6 +++ app/build.gradle | 20 +++---- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 19 files changed, 121 insertions(+), 472 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/runConfigurations/Step_1___Dao.xml delete mode 100644 .idea/runConfigurations/Step_1___Solution.xml delete mode 100644 .idea/runConfigurations/Step_2___Relationships.xml delete mode 100644 .idea/runConfigurations/Step_3___Async_calls.xml delete mode 100644 .idea/runConfigurations/Step_3___Solution.xml delete mode 100644 .idea/runConfigurations/Step_4___Solution.xml delete mode 100644 .idea/runConfigurations/Step_4___Type_converters.xml delete mode 100644 .idea/runConfigurations/Step_5___Custom_Results.xml delete mode 100644 .idea/runConfigurations/Step_5___Solution.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..9702d48db4c9fde9bfb00784dec10bc21c3c2406 GIT binary patch literal 543 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}nf0c10SKynv@@rSL^KK{4FriF+HzAIti zNdoy7rmK*lj)4uN@FxGc-X@t?9o8wnkG_7IuUf(&kdvRBm;(x}g4Cjt%+%sixMDAV zg@xa@RWEybTOy=znTSFOgPwk9acWVqenDbsPJT{iUPdC&_4-g-^brA%Vbm4bo}2v) zn^;~paL#!1!>O)>K@gAXdCOYuuVlAJD(SwQvhqbk9MF}C1qJ%py;M;d*}UY@*(q + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..99202cc --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..5244278 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Step_1___Dao.xml b/.idea/runConfigurations/Step_1___Dao.xml deleted file mode 100644 index bd680d9..0000000 --- a/.idea/runConfigurations/Step_1___Dao.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_1___Solution.xml b/.idea/runConfigurations/Step_1___Solution.xml deleted file mode 100644 index 9ea1d6d..0000000 --- a/.idea/runConfigurations/Step_1___Solution.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_2___Relationships.xml b/.idea/runConfigurations/Step_2___Relationships.xml deleted file mode 100644 index 6c22f64..0000000 --- a/.idea/runConfigurations/Step_2___Relationships.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_3___Async_calls.xml b/.idea/runConfigurations/Step_3___Async_calls.xml deleted file mode 100644 index cefcc50..0000000 --- a/.idea/runConfigurations/Step_3___Async_calls.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_3___Solution.xml b/.idea/runConfigurations/Step_3___Solution.xml deleted file mode 100644 index cbec36e..0000000 --- a/.idea/runConfigurations/Step_3___Solution.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_4___Solution.xml b/.idea/runConfigurations/Step_4___Solution.xml deleted file mode 100644 index 5190a18..0000000 --- a/.idea/runConfigurations/Step_4___Solution.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_4___Type_converters.xml b/.idea/runConfigurations/Step_4___Type_converters.xml deleted file mode 100644 index b186340..0000000 --- a/.idea/runConfigurations/Step_4___Type_converters.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_5___Custom_Results.xml b/.idea/runConfigurations/Step_5___Custom_Results.xml deleted file mode 100644 index 7ad9073..0000000 --- a/.idea/runConfigurations/Step_5___Custom_Results.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Step_5___Solution.xml b/.idea/runConfigurations/Step_5___Solution.xml deleted file mode 100644 index a330ff3..0000000 --- a/.idea/runConfigurations/Step_5___Solution.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f272c07..cba1d4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 - buildToolsVersion "27.0.0" + buildToolsVersion '27.0.3' defaultConfig { applicationId 'com.example.android.codelabs.persistence' minSdkVersion 21 @@ -46,19 +46,19 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion, { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('com.android.support.test.espresso:espresso-core:' + rootProject.espressoVersion, { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:' + rootProject.supportLibVersion - compile 'com.android.support:cardview-v7:' + rootProject.supportLibVersion - compile 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion - compile 'com.android.support:support-v4:' + rootProject.supportLibVersion + implementation 'com.android.support:appcompat-v7:' + rootProject.supportLibVersion + implementation 'com.android.support:cardview-v7:' + rootProject.supportLibVersion + implementation 'com.android.support:recyclerview-v7:' + rootProject.supportLibVersion + implementation 'com.android.support:support-v4:' + rootProject.supportLibVersion - testCompile 'junit:junit:4.12' - compile 'android.arch.lifecycle:extensions:' + rootProject.archLifecycleVersion - compile 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion + testImplementation 'junit:junit:4.12' + implementation 'android.arch.lifecycle:extensions:' + rootProject.archLifecycleVersion + implementation 'android.arch.persistence.room:runtime:' + rootProject.archRoomVersion annotationProcessor 'android.arch.lifecycle:compiler:' + rootProject.archLifecycleVersion annotationProcessor 'android.arch.persistence.room:compiler:' + rootProject.archRoomVersion } diff --git a/build.gradle b/build.gradle index 2a6ce4e..e140b2c 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.1.4' // 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 a052f6e..edce5fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 13 23:43:41 GMT 2017 +#Fri Sep 14 11:27:18 BRT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip