From bc6a7bb5595f18997464d776c2ef24ef43cdc5e6 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Fri, 5 Jan 2018 14:47:29 -0600 Subject: [PATCH] Dependency, gradle, etc. updates --- .idea/markdown-navigator.xml | 72 +++++++++++++++++++ .../markdown-navigator/profiles_settings.xml | 3 + .travis.yml | 4 +- app/build.gradle | 3 - build.gradle | 8 +-- dependencies.gradle | 12 ++-- gradle/wrapper/gradle-wrapper.properties | 4 +- 7 files changed, 88 insertions(+), 18 deletions(-) create mode 100644 .idea/markdown-navigator.xml create mode 100644 .idea/markdown-navigator/profiles_settings.xml diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 0000000..d819570 --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml new file mode 100644 index 0000000..57927c5 --- /dev/null +++ b/.idea/markdown-navigator/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3538182..9cd1ea0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ android: components: - tools - platform-tools - - build-tools-26.0.0 - - android-26 + - build-tools-27.0.2 + - android-27 - extra-android-support - extra-android-m2repository - extra-google-m2repository diff --git a/app/build.gradle b/app/build.gradle index 7ca4beb..db9afa2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,9 +14,6 @@ android { lintOptions { abortOnError false } - jackOptions { - enabled true - } } compileOptions { diff --git a/build.gradle b/build.gradle index d68c028..93c3bb9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { apply from: './dependencies.gradle' repositories { + google() jcenter() } dependencies { @@ -14,13 +15,14 @@ buildscript { allprojects { repositories { + google() jcenter() maven { url "https://jitpack.io" } } buildscript { repositories { - maven { url "https://plugins.gradle.org/m2/" } + google() } } apply plugin: "com.diffplug.gradle.spotless" @@ -34,7 +36,3 @@ allprojects { } } } - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/dependencies.gradle b/dependencies.gradle index 2ddd7c7..2fa2f94 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,13 +1,13 @@ ext.versions = [ minSdk : 21, - compileSdk : 26, - buildTools : '26.0.0', + compileSdk : 27, + buildTools : '27.0.2', publishVersion : '0.1.3.1', publishVersionCode: 14, - gradlePlugin : '2.3.2', - spotlessPlugin : '3.4.0', - supportLib : '25.3.1', - materialDialogs : '0.9.4.5', + gradlePlugin : '3.0.1', + spotlessPlugin : '3.8.0', + supportLib : '27.0.2', + materialDialogs : '0.9.6.0', bridge : '5.1.2', inquiry : '5.0.0' ] \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41f2737..e2a2454 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Aug 24 19:51:45 CDT 2016 +#Fri Jan 05 14:44:01 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip