diff --git a/.gradle/4.1/fileChanges/last-build.bin b/.gradle/4.1/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/4.1/fileChanges/last-build.bin differ diff --git a/.gradle/4.1/fileContent/fileContent.lock b/.gradle/4.1/fileContent/fileContent.lock new file mode 100644 index 0000000..1f52464 Binary files /dev/null and b/.gradle/4.1/fileContent/fileContent.lock differ diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000..738ab95 Binary files /dev/null and b/.gradle/4.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000..126c3b8 Binary files /dev/null and b/.gradle/4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.1/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..26fc107 Binary files /dev/null and b/.gradle/4.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin new file mode 100644 index 0000000..bd6b5cb Binary files /dev/null and b/.gradle/4.1/javaCompile/classAnalysis.bin differ diff --git a/.gradle/4.1/javaCompile/jarAnalysis.bin b/.gradle/4.1/javaCompile/jarAnalysis.bin new file mode 100644 index 0000000..c26eb84 Binary files /dev/null and b/.gradle/4.1/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock new file mode 100644 index 0000000..2d458f0 Binary files /dev/null and b/.gradle/4.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin new file mode 100644 index 0000000..32a8e69 Binary files /dev/null and b/.gradle/4.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/4.1/javaCompile/taskJars.bin b/.gradle/4.1/javaCompile/taskJars.bin new file mode 100644 index 0000000..27dcda6 Binary files /dev/null and b/.gradle/4.1/javaCompile/taskJars.bin differ diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin new file mode 100644 index 0000000..5d95b7a Binary files /dev/null and b/.gradle/4.1/taskHistory/fileSnapshots.bin differ diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin new file mode 100644 index 0000000..93f30f1 Binary files /dev/null and b/.gradle/4.1/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock new file mode 100644 index 0000000..67b7760 Binary files /dev/null and b/.gradle/4.1/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/built.bin b/.gradle/buildOutputCleanup/built.bin new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..47fe33a --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Thu Jan 17 13:42:21 PST 2019 +gradle.version=4.1 diff --git a/.gradle/buildOutputCleanup/cache.properties.lock b/.gradle/buildOutputCleanup/cache.properties.lock new file mode 100644 index 0000000..40fdece --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties.lock @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index bb09f4f..1b739a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,12 +51,12 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // android support libraries - implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" - implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion" - implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion" - implementation "com.android.support:design:$rootProject.supportLibraryVersion" - implementation "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion" - implementation "com.android.support:animated-vector-drawable:$rootProject.supportLibraryVersion" + implementation "com.android.support:appcompat-v7:$supportLibraryVersion" + implementation "com.android.support:recyclerview-v7:$supportLibraryVersion" + implementation "com.android.support:cardview-v7:$supportLibraryVersion" + implementation "com.android.support:design:$supportLibraryVersion" + implementation "com.android.support:support-vector-drawable:$supportLibraryVersion" + implementation "com.android.support:animated-vector-drawable:$supportLibraryVersion" // font implementation "uk.co.chrisjenx:calligraphy:$rootProject.calligraphyVersion" diff --git a/build.gradle b/build.gradle index 685164b..2478925 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ ext { buildToolsVersion = '26.0.2' // App dependencies - supportLibraryVersion = '26.1.0' + supportLibraryVersion = '27.0.2' gsonVersion = '2.8.0' calligraphyVersion = '2.2.0' glideVersion = '3.7.0' @@ -70,3 +70,16 @@ ext { espressoVersion = '2.2.2' mockitoVersion = '2.7.1' } + +configurations.all { + resolutionStrategy { + eachDependency { details -> + // Force all of the primary support libraries to use the same version. + if (details.requested.group == 'com.android.support' + && details.requested.name != 'multidex' + && details.requested.name != 'multidex-instrumentation') { + details.useVersion supportLibraryVersion + } + } + } +}