wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update some gradle things to reflect Android Studio 3 changes

Browse source
This commit is contained in:
tibbi 2017-11-18 21:25:03 +01:00
parent 34b2ad3af4
commit 61c0c3f29e
3 changed files with 27 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
build.gradle
View file

@ -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'
}

27
commons/build.gradle
View file

@ -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'

17
samples/build.gradle
View file

@ -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')
}