From 8ecb9578195eff403f4b00b7b27ba7bc79f8dbda Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 27 Oct 2017 13:05:21 -0700 Subject: [PATCH] Fix to Travis and Circle CIs. --- .idea/misc.xml | 2 +- .travis.yml | 2 +- app/build.gradle | 40 ++++++++++++++++++++-------------------- build.gradle | 1 + circle.yml | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 75dac50..3963879 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/.travis.yml b/.travis.yml index d286fe7..f719359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ android: components: - tools - platform-tools - - build-tools-26.0.1 + - build-tools-26.0.2 - android-26 - extra-google-m2repository - extra-android-m2repository diff --git a/app/build.gradle b/app/build.gradle index adb18a6..6549758 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,46 +27,46 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' - compile 'com.android.support:support-v13:26.1.0' - compile 'com.android.support:appcompat-v7:26.1.0' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile 'org.jetbrains.anko:anko-sdk23:0.10.2' - compile 'org.jetbrains.anko:anko-appcompat-v7:0.10.2' - compile 'org.jetbrains.anko:anko-support-v4:0.10.2' - compile 'org.jetbrains.anko:anko-design:0.10.2' - compile 'com.android.support:design:26.1.0' - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2' + implementation 'com.android.support:support-v13:26.1.0' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'org.jetbrains.anko:anko-sdk23:0.10.2' + implementation 'org.jetbrains.anko:anko-appcompat-v7:0.10.2' + implementation 'org.jetbrains.anko:anko-support-v4:0.10.2' + implementation 'org.jetbrains.anko:anko-design:0.10.2' + implementation 'com.android.support:design:26.1.0' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2' // https://github.com/JakeWharton/ViewPagerIndicator - compile 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar' + implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar' // https://github.com/AndroidDeveloperLB/AutoFitTextView - compile 'com.github.AndroidDeveloperLB:AutoFitTextView:4' + implementation 'com.github.AndroidDeveloperLB:AutoFitTextView:4' // https://github.com/hotchemi/PermissionsDispatcher - compile 'com.github.hotchemi:permissionsdispatcher:3.0.1' + implementation 'com.github.hotchemi:permissionsdispatcher:3.0.1' kapt 'com.github.hotchemi:permissionsdispatcher-processor:3.0.1' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" // https://github.com/eggheadgames/android-about-box - compile 'com.github.eggheadgames:android-about-box:1.3.1' + implementation 'com.github.eggheadgames:android-about-box:1.3.1' //compile(name: 'library-debug', ext: 'aar') //compile 'com.github.daniel-stoneuk:material-about-library:2.2.1' - compile 'com.android.support:animated-vector-drawable:26.1.0' - compile 'com.android.support:cardview-v7:26.1.0' + implementation 'com.android.support:animated-vector-drawable:26.1.0' + implementation 'com.android.support:cardview-v7:26.1.0' // https://github.com/ACRA/acra - compile 'ch.acra:acra:4.9.2' + implementation 'ch.acra:acra:4.9.2' } repositories { mavenCentral() + google() maven { url "https://jitpack.io" } - maven { url "https://maven.google.com" } } kapt { diff --git a/build.gradle b/build.gradle index 5679e48..703bae7 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { ext.kotlin_version = '1.1.51' repositories { jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.0.0' diff --git a/circle.yml b/circle.yml index 9aaed7c..6b2ffdd 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,7 @@ machine: dependencies: override: - chmod +x gradlew - - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-26.0.1,android-26,extra-google-m2repository,extra-android-m2repository,extra-android-support + - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-26.0.2,android-26,extra-google-m2repository,extra-android-m2repository,extra-android-support - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies test: