Update Gradle for Android Studio 3.0 (#344)
This commit is contained in:
Eugene Cheung
GitHub
parent
3c685a9a1a
commit
451a093c09
3 changed files with 54 additions and 51 deletions
|
|
@ -19,7 +19,7 @@ repositories {
|
|||
maven { url 'https://maven.fabric.io/public' }
|
||||
}
|
||||
|
||||
def gitBranch() {
|
||||
static def gitBranch() {
|
||||
def branch = ''
|
||||
def proc = 'git rev-parse --abbrev-ref HEAD'.execute()
|
||||
proc.in.eachLine { line -> branch = line }
|
||||
|
|
@ -30,7 +30,7 @@ def gitBranch() {
|
|||
|
||||
android {
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion '26.0.1'
|
||||
buildToolsVersion '26.0.2'
|
||||
dataBinding {
|
||||
enabled = true
|
||||
}
|
||||
|
|
@ -74,52 +74,54 @@ ext {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
|
||||
compile "com.android.support:support-compat:$supportLibVersion"
|
||||
compile "com.android.support:support-core-utils:$supportLibVersion"
|
||||
compile "com.android.support:support-core-ui:$supportLibVersion"
|
||||
compile "com.android.support:support-media-compat:$supportLibVersion"
|
||||
compile "com.android.support:support-fragment:$supportLibVersion"
|
||||
compile "com.android.support:support-v13:$supportLibVersion"
|
||||
compile "com.android.support:appcompat-v7:$supportLibVersion"
|
||||
compile "com.android.support:recyclerview-v7:$supportLibVersion"
|
||||
compile "com.android.support:gridlayout-v7:$supportLibVersion"
|
||||
compile "com.android.support:cardview-v7:$supportLibVersion"
|
||||
compile "com.android.support:palette-v7:$supportLibVersion"
|
||||
compile "com.android.support:design:$supportLibVersion"
|
||||
compile "com.android.support:support-annotations:$supportLibVersion"
|
||||
compile "com.android.support:percent:$supportLibVersion"
|
||||
compile "com.android.support:preference-v7:$supportLibVersion"
|
||||
compile "com.android.support:preference-v14:$supportLibVersion"
|
||||
implementation "com.android.support:support-compat:$supportLibVersion"
|
||||
implementation "com.android.support:support-core-utils:$supportLibVersion"
|
||||
implementation "com.android.support:support-core-ui:$supportLibVersion"
|
||||
implementation "com.android.support:support-media-compat:$supportLibVersion"
|
||||
implementation "com.android.support:support-fragment:$supportLibVersion"
|
||||
implementation "com.android.support:support-v13:$supportLibVersion"
|
||||
implementation "com.android.support:appcompat-v7:$supportLibVersion"
|
||||
implementation "com.android.support:recyclerview-v7:$supportLibVersion"
|
||||
implementation "com.android.support:gridlayout-v7:$supportLibVersion"
|
||||
implementation "com.android.support:cardview-v7:$supportLibVersion"
|
||||
implementation "com.android.support:palette-v7:$supportLibVersion"
|
||||
implementation "com.android.support:design:$supportLibVersion"
|
||||
implementation "com.android.support:support-annotations:$supportLibVersion"
|
||||
implementation "com.android.support:percent:$supportLibVersion"
|
||||
implementation "com.android.support:preference-v7:$supportLibVersion"
|
||||
implementation "com.android.support:preference-v14:$supportLibVersion"
|
||||
|
||||
// compile 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6'
|
||||
// TODO: go back to master branch as soon as possible
|
||||
// TODO: update to 0.11.0: https://github.com/h6ah4i/android-advancedrecyclerview/issues/425
|
||||
// implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6'
|
||||
|
||||
compile 'com.github.kabouzeid:app-theme-helper:1.3.7'
|
||||
compile 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod'
|
||||
compile 'com.github.kabouzeid:SeekArc:1.2-kmod'
|
||||
compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3'
|
||||
compile 'com.afollestad.material-dialogs:core:0.9.4.5'
|
||||
compile 'com.afollestad.material-dialogs:commons:0.9.4.5'
|
||||
compile 'com.afollestad:material-cab:0.1.12'
|
||||
compile 'com.github.h6ah4i:android-advancedrecyclerview:7020c4c400' // support lib 26 support
|
||||
compile 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
||||
compile 'com.squareup.retrofit2:retrofit:2.3.0'
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
|
||||
compile 'com.anjlab.android.iab.v3:library:1.0.44'
|
||||
compile 'de.psdev.licensesdialog:licensesdialog:1.8.1'
|
||||
compile 'com.github.bumptech.glide:glide:3.8.0'
|
||||
compile 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
|
||||
compile 'com.heinrichreimersoftware:material-intro:1.6.2'
|
||||
compile 'me.zhanghai.android.materialprogressbar:library:1.4.1'
|
||||
compile 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
|
||||
compile 'com.jakewharton:butterknife:8.6.0'
|
||||
testCompile 'junit:junit:4.12'
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
|
||||
implementation 'com.github.kabouzeid:app-theme-helper:1.3.7'
|
||||
implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod'
|
||||
implementation 'com.github.kabouzeid:SeekArc:1.2-kmod'
|
||||
implementation 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3'
|
||||
implementation 'com.afollestad.material-dialogs:core:0.9.4.5'
|
||||
implementation 'com.afollestad.material-dialogs:commons:0.9.4.5'
|
||||
implementation 'com.afollestad:material-cab:0.1.12'
|
||||
implementation 'com.github.h6ah4i:android-advancedrecyclerview:7020c4c400'
|
||||
implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
||||
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
|
||||
implementation 'com.anjlab.android.iab.v3:library:1.0.44'
|
||||
implementation 'de.psdev.licensesdialog:licensesdialog:1.8.3'
|
||||
implementation 'com.github.bumptech.glide:glide:3.8.0'
|
||||
implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
|
||||
implementation 'com.heinrichreimersoftware:material-intro:1.6.2'
|
||||
implementation 'me.zhanghai.android.materialprogressbar:library:1.4.1'
|
||||
implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
|
||||
implementation 'com.jakewharton:butterknife:8.6.0'
|
||||
|
||||
compile 'com.crashlytics.sdk.android:crashlytics:2.6.8'
|
||||
compile('com.crashlytics.sdk.android:answers:1.3.13@aar') {
|
||||
transitive = true;
|
||||
implementation 'com.crashlytics.sdk.android:crashlytics:2.7.1'
|
||||
implementation('com.crashlytics.sdk.android:answers:1.3.13@aar') {
|
||||
transitive = true
|
||||
}
|
||||
|
||||
testImplementation 'junit:junit:4.12'
|
||||
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.3.3'
|
||||
classpath 'com.android.tools.build:gradle:3.0.0'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#Thu Jun 15 14:24:17 EDT 2017
|
||||
#Sun Oct 29 21:05:30 EDT 2017
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue