Skip to content

gradle #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
compileSdkVersion 29
buildToolsVersion "29"

defaultConfig {
applicationId "com.cheikh.lazywaimai"
minSdkVersion 16
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -42,13 +42,13 @@ android {

configurations.all {
// 如下依赖冲突时强制使用制定版本
resolutionStrategy {
force "com.android.support:appcompat-v7:$supportVersion"
force "com.android.support:design:$supportVersion"
force "com.android.support:support-annotation:$supportVersion"
force "com.android.support:support-v4:$supportVersion"
force "com.android.support:support-v7:$supportVersion"
}
// resolutionStrategy {
// force "com.android.support:appcompat-v7:$supportVersion"
// force "com.android.support:design:$supportVersion"
// force "com.android.support:support-annotation:$supportVersion"
// force "com.android.support:support-v4:$supportVersion"
// force "com.android.support:support-v7:$supportVersion"
// }
}

dependencies {
Expand All @@ -63,8 +63,8 @@ dependencies {
implementation 'com.google.guava:guava:18.0'
implementation 'com.google.code.gson:gson:2.6.1'
// View注入框架
implementation 'com.jakewharton:butterknife:9.0.0-rc1'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
implementation 'com.jakewharton:butterknife:10.2.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
// 依赖注入框架
implementation 'com.squareup.dagger:dagger:1.2.2'
annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
Expand All @@ -81,7 +81,7 @@ dependencies {
// 漂亮的日志打印工具
implementation 'com.orhanobut:logger:2.2.0'
// View注入框架
implementation 'com.jakewharton:butterknife:7.0.1'
implementation 'com.jakewharton:butterknife:10.2.1'
// 动画库
implementation 'com.nineoldandroids:library:2.4.0'
// 底部Tab组件
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

ext {
supportVersion = '28.0.0'
supportVersion = '29'
}

buildscript {
Expand All @@ -10,11 +10,11 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.6.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc1'
classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https://services.gradle.org/distributions/gradle-5.6.4-all.zip