Skip to content

Commit 1262fa4

Browse files
committed
升级gradle插件版本为3.0.1
1 parent 411a8d3 commit 1262fa4

File tree

4 files changed

+29
-18
lines changed

4 files changed

+29
-18
lines changed

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ dependencies {
4040
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
4141
exclude group: 'com.android.support', module: 'support-annotations'
4242
})
43-
compile project(':dmvp')
43+
api project(':dmvp')
4444
// compile 'com.github.chenyy0708:DMvp:v1.0.1'
45-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
46-
compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.5'
45+
api 'com.android.support.constraint:constraint-layout:1.0.2'
46+
api 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.5'
4747

4848
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"] // 编译代码
4949
annotationProcessor rootProject.ext.dependencies["butterknife-compiler"]

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.3.3'
9+
classpath 'com.android.tools.build:gradle:3.0.1'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

dmvp/build.gradle

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,45 @@ dependencies {
3434
compile fileTree(include: ['*.jar'], dir: 'libs')
3535

3636
//support
37-
compile(rootProject.ext.dependencies["support-v4"]) {
37+
api(rootProject.ext.dependencies["support-v4"]) {
3838
exclude module: 'support-annotations'
3939
}
40-
compile(rootProject.ext.dependencies["appcompat-v7"]) {
40+
api(rootProject.ext.dependencies["appcompat-v7"]) {
4141
exclude module: 'support-annotations'
4242
exclude module: 'support-v4'
4343
}
44-
compile(rootProject.ext.dependencies["design"]) {
44+
api(rootProject.ext.dependencies["design"]) {
4545
exclude module: 'support-annotations'
4646
exclude module: 'appcompat-v7'
4747
exclude module: 'support-v4'
4848
}
49-
compile rootProject.ext.dependencies["annotations"]
49+
api(rootProject.ext.dependencies["rxlifecycle2"]) {
50+
exclude module: 'rxjava'
51+
exclude module: 'jsr305'
52+
}
53+
api(rootProject.ext.dependencies["rxlifecycle2-android"]) {
54+
exclude module: 'support-annotations'
55+
exclude module: 'rxjava'
56+
exclude module: 'rxandroid'
57+
exclude module: 'rxlifecycle'
58+
}
59+
api rootProject.ext.dependencies["annotations"]
5060
// retrofit
51-
compile rootProject.ext.dependencies["retrofit"]
52-
compile rootProject.ext.dependencies["retrofit-converter-gson"]
53-
compile rootProject.ext.dependencies["retrofit-adapter-rxjava2"]
54-
compile 'com.squareup.okhttp3:logging-interceptor:3.9.1'
61+
api rootProject.ext.dependencies["retrofit"]
62+
api rootProject.ext.dependencies["retrofit-converter-gson"]
63+
api rootProject.ext.dependencies["retrofit-adapter-rxjava2"]
64+
api 'com.squareup.okhttp3:logging-interceptor:3.9.1'
5565
// rxjava2
56-
compile rootProject.ext.dependencies["rxjava2"]
57-
compile rootProject.ext.dependencies["rxandroid2"]
66+
api rootProject.ext.dependencies["rxjava2"]
67+
api rootProject.ext.dependencies["rxandroid2"]
5868
// dagger2
59-
compile rootProject.ext.dependencies["dagger2"]
69+
api rootProject.ext.dependencies["dagger2"]
6070
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
6171
// butterknife
62-
compile rootProject.ext.dependencies["butterknife"]
72+
api rootProject.ext.dependencies["butterknife"]
6373
annotationProcessor rootProject.ext.dependencies["butterknife-compiler"]
64-
compile 'com.jaeger.statusbaruitl:library:1.3.6' // 沉浸式状态栏
65-
compile 'com.android.support:multidex:1.0.1'
74+
api 'com.jaeger.statusbaruitl:library:1.3.6' // 沉浸式状态栏
75+
api 'com.android.support:multidex:1.0.1'
6676
}
6777

6878

dmvp/src/main/java/com/chen/common/base/BaseActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public void onCreate(Bundle savedInstanceState) {
4343
mContext = this;
4444
setupActivityComponent(CUtils.obtainAppComponentFromContext(mContext)); // dagger2注入
4545
this.initData(savedInstanceState);
46+
4647
}
4748

4849
/**

0 commit comments

Comments
 (0)