Skip to content

Commit

Permalink
update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
huburt-Hu committed May 28, 2018
1 parent 341e508 commit ef79b84
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
31 changes: 16 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdkVersion 26
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.app.hubert.newbieguide"
Expand All @@ -18,30 +18,31 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile project(':guide')
// compile 'com.github.huburt-Hu:NewbieGuide:v2.1.0'
compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile "com.android.support:recyclerview-v7:$rootProject.ext.supportLibraryVersion"
compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.28'
compile("com.jaeger.statusbarutil:library:1.4.0") {
implementation project(':guide')
// implementation ('com.github.huburt-Hu:NewbieGuide:v2.2.0')
implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation "com.android.support:recyclerview-v7:$rootProject.ext.supportLibraryVersion"
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.28'
implementation("com.jaeger.statusbarutil:library:1.4.0") {
exclude group: 'com.android.support'
}
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'

// Lifecycles, LiveData 和 ViewModel
compile 'android.arch.lifecycle:runtime:1.0.3'
compile 'android.arch.lifecycle:extensions:1.0.0'
implementation 'android.arch.lifecycle:runtime:1.0.3'
implementation 'android.arch.lifecycle:extensions:1.0.0'
annotationProcessor "android.arch.lifecycle:compiler:1.0.0"
// Room
compile 'android.arch.persistence.room:runtime:1.0.0'
implementation 'android.arch.persistence.room:runtime:1.0.0'
annotationProcessor "android.arch.persistence.room:compiler:1.0.0"

debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
Expand Down
11 changes: 5 additions & 6 deletions guide/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ apply plugin: 'com.github.dcendents.android-maven'
group = 'com.github.huburt-Hu'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdkVersion 26

defaultConfig {
minSdkVersion 14
targetSdkVersion 26
versionCode 1
versionName "1.0"
versionCode 22
versionName "2.2.0"

}
buildTypes {
Expand All @@ -23,6 +22,6 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
}

0 comments on commit ef79b84

Please sign in to comment.