From 15b93bbd9e3d0b0491b7db6ca48d8507143fd095 Mon Sep 17 00:00:00 2001 From: Amine Bou Date: Tue, 27 Mar 2018 19:59:34 +0200 Subject: [PATCH] Updated AS. Enabled build cache. --- app/build.gradle | 74 ++++++++++++------------ build.gradle | 4 +- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 4 +- settings.gradle | 19 ++++++ 5 files changed, 61 insertions(+), 41 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dc981aa..5869a47 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ repositories { android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { applicationId "apps.amine.bou.readerforselfoss" minSdkVersion 16 @@ -108,78 +108,78 @@ android { dependencies { // Testing - androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1' - androidTestCompile 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.1' // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource - androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1' // Espresso-intents for validation and stubbing of Intents - androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1' - compile fileTree(dir: 'libs', include: ['*.jar']) - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // Android Support - compile 'com.android.support:appcompat-v7:27.1.0' - compile 'com.android.support:design:27.1.0' - compile 'com.android.support:recyclerview-v7:27.1.0' - compile 'com.android.support:support-v4:27.1.0' - compile 'com.android.support:support-vector-drawable:27.1.0' - compile 'com.android.support:customtabs:27.1.0' - compile 'com.android.support:cardview-v7:27.1.0' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:appcompat-v7:27.1.0' + implementation 'com.android.support:design:27.1.0' + implementation 'com.android.support:recyclerview-v7:27.1.0' + implementation 'com.android.support:support-v4:27.1.0' + implementation 'com.android.support:support-vector-drawable:27.1.0' + implementation 'com.android.support:customtabs:27.1.0' + implementation 'com.android.support:cardview-v7:27.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' // Firebase + crashlytics - compile 'com.google.firebase:firebase-core:12.0.0' - compile 'com.google.firebase:firebase-config:12.0.0' - compile 'com.google.firebase:firebase-invites:12.0.0' - compile('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') { + implementation 'com.google.firebase:firebase-core:12.0.0' + implementation 'com.google.firebase:firebase-config:12.0.0' + implementation 'com.google.firebase:firebase-invites:12.0.0' + implementation('com.crashlytics.sdk.android:crashlytics:2.9.0@aar') { transitive = true } //multidex - compile 'com.android.support:multidex:1.0.3' + implementation 'com.android.support:multidex:1.0.3' // Intro - compile 'agency.tango.android:material-intro-screen:0.0.5' + implementation 'agency.tango.android:material-intro-screen:0.0.5' // About - compile('com.mikepenz:aboutlibraries:6.0.0@aar') { + implementation('com.mikepenz:aboutlibraries:6.0.0@aar') { transitive = true } // Retrofit + http logging + okhttp - compile 'com.squareup.retrofit2:retrofit:2.3.0' - compile 'com.squareup.okhttp3:logging-interceptor:3.9.0' - compile 'com.squareup.retrofit2:converter-gson:2.3.0' - compile 'com.burgstaller:okhttp-digest:1.12' + implementation 'com.squareup.retrofit2:retrofit:2.3.0' + implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.3.0' + implementation 'com.burgstaller:okhttp-digest:1.12' // Material-ish things - compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.3' - compile 'com.github.jd-alexander:LikeButton:0.2.1' - compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' + implementation 'com.ashokvarma.android:bottom-navigation-bar:2.0.3' + implementation 'com.github.jd-alexander:LikeButton:0.2.1' + implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' // glide - compile 'com.github.bumptech.glide:glide:4.1.1' - compile 'com.github.bumptech.glide:okhttp3-integration:4.1.1' + implementation 'com.github.bumptech.glide:glide:4.1.1' + implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1' // Asking politely users to rate the app - compile 'com.github.stkent:amplify:2.1.0' + implementation 'com.github.stkent:amplify:2.1.0' // Drawer implementation 'co.zsmb:materialdrawer-kt:1.2.1' - compile 'com.anupcowkur:reservoir:3.1.0' + implementation 'com.anupcowkur:reservoir:3.1.0' // Themes - compile 'com.52inc:scoops:1.0.0' + implementation 'com.52inc:scoops:1.0.0' // Github issues reporter - compile 'com.heinrichreimersoftware:android-issue-reporter:1.3.1' + implementation 'com.heinrichreimersoftware:android-issue-reporter:1.3.1' - compile 'com.github.rubensousa:floatingtoolbar:1.5.1' + implementation 'com.github.rubensousa:floatingtoolbar:1.5.1' // Pager - compile 'me.relex:circleindicator:1.2.2@aar' + implementation 'me.relex:circleindicator:1.2.2@aar' implementation 'androidx.core:core-ktx:0.2' diff --git a/build.gradle b/build.gradle index d9bb4c0..c068089 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.2.31' repositories { jcenter() google() @@ -10,7 +10,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index aac7c9b..1ea571b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +org.gradle.caching=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 242eea6..7f65686 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Sep 02 11:43:17 CEST 2017 +#Tue Mar 27 19:14:12 CEST 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 diff --git a/settings.gradle b/settings.gradle index e7b4def..87d5ab3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,20 @@ include ':app' + +ext.isCiServer = !!System.getProperty("CI") + +buildCache { + local { + enabled = !isCiServer + } + remote(HttpBuildCache) { + url = 'http://amine-bou.fr:8885/cache/' + push = isCiServer + + println "user " + System.getProperty("cacheUser") + println "pass " + System.getProperty("cachePassword") + credentials { + username = System.getProperty("cacheUser") + password = System.getProperty("cachePassword") + } + } +} \ No newline at end of file