diff --git a/build.gradle b/build.gradle index 9bd1cd153..f8269b01c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,28 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext { + propBuildToolsVersion = '27.0.1' + propCompileSdkVersion = 27 + propMinSdkVersion = 16 + propTargetSdkVersion = propCompileSdkVersion + propVersionCode = 1 + propVersionName = '2.40.0' + kotlin_version = '1.1.60' + support_libs = '27.0.1' + } + repositories { jcenter() - maven { url 'https://maven.google.com' } + google() } + dependencies { classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -17,7 +31,7 @@ buildscript { allprojects { repositories { jcenter() - maven { url 'https://maven.google.com' } + google() maven { url 'https://jitpack.io' } } } @@ -25,14 +39,3 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } - -ext { - propBuildToolsVersion = '27.0.1' - propCompileSdkVersion = 27 - propMinSdkVersion = 16 - propTargetSdkVersion = propCompileSdkVersion - propVersionCode = 1 - propVersionName = '2.39.10' - kotlin_version = '1.1.60' - support_libs = '27.0.1' -} diff --git a/commons/build.gradle b/commons/build.gradle index eb7d41c2c..c81122c5f 100644 --- a/commons/build.gradle +++ b/commons/build.gradle @@ -27,27 +27,16 @@ android { } dependencies { - compile "com.android.support:design:$support_libs" - compile "com.android.support:appcompat-v7:$support_libs" - compile 'com.github.bumptech.glide:glide:4.3.1' - compile 'com.booking:rtlviewpager:1.0.1' - compile 'com.andrognito.patternlockview:patternlockview:1.0.0' - compile 'com.github.ajalt.reprint:core:3.2.0@aar' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile 'com.bignerdranch.android:recyclerview-multiselect:0.2' + implementation "com.android.support:design:$support_libs" + implementation "com.android.support:appcompat-v7:$support_libs" + implementation 'com.github.bumptech.glide:glide:4.3.1' + implementation 'com.booking:rtlviewpager:1.0.1' + implementation 'com.andrognito.patternlockview:patternlockview:1.0.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'com.bignerdranch.android:recyclerview-multiselect:0.2' + api 'com.github.ajalt.reprint:core:3.2.0@aar' annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1' } -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" - } -} - apply from: '../bintray-upload.gradle' diff --git a/samples/build.gradle b/samples/build.gradle index 7810ac980..85af645ce 100644 --- a/samples/build.gradle +++ b/samples/build.gradle @@ -27,19 +27,8 @@ android { } dependencies { - compile "com.android.support:appcompat-v7:$support_libs" - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation "com.android.support:appcompat-v7:$support_libs" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile project(':commons') -} - -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" - } + implementation project(':commons') }