Skip to content

Commit de18411

Browse files
author
xu.yi
committed
修改依赖方式
1 parent 0af4807 commit de18411

19 files changed

Lines changed: 117 additions & 102 deletions

File tree

‎app-demo/app-demo.iml‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0-alpha04@jar" level="project" />
9494
<orderEntry type="library" name="Gradle: androidx.paging:paging-common:2.1.0@jar" level="project" />
9595
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0-alpha01@jar" level="project" />
96+
<orderEntry type="library" name="Gradle: androidx.room:room-common:2.1.0-alpha04@jar" level="project" />
9697
<orderEntry type="library" name="Gradle: androidx.concurrent:concurrent-futures:1.0.0-alpha02@jar" level="project" />
9798
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0-beta01@jar" level="project" />
9899
<orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3@jar" level="project" />
@@ -117,52 +118,56 @@
117118
<orderEntry type="library" name="Gradle: androidx.databinding:databinding-runtime:3.6.2@aar" level="project" />
118119
<orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
119120
<orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:3.6.2@aar" level="project" />
120-
<orderEntry type="library" name="Gradle: com.google.android.material:material:1.1.0-alpha05@aar" level="project" />
121-
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0-alpha04@aar" level="project" />
122121
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.1.0-alpha04@aar" level="project" />
123-
<orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:4.10.0@aar" level="project" />
124122
<orderEntry type="library" name="Gradle: com.cysion:ImagePicker:1.0.6@aar" level="project" />
125123
<orderEntry type="library" name="Gradle: com.github.chrisbanes.photoview:library:1.2.4@aar" level="project" />
126124
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
125+
<orderEntry type="library" name="Gradle: androidx.room:room-runtime:2.1.0-alpha04@aar" level="project" />
126+
<orderEntry type="library" name="Gradle: com.google.android.material:material:1.1.0-alpha05@aar" level="project" />
127+
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0-alpha04@aar" level="project" />
128+
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
129+
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
130+
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
131+
<orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:4.10.0@aar" level="project" />
127132
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0-alpha06@aar" level="project" />
128133
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0-alpha04@aar" level="project" />
129-
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
130134
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
131-
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
132-
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
133135
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
134-
<orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0-alpha06@aar" level="project" />
135-
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0-alpha01@aar" level="project" />
136-
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0-alpha01@aar" level="project" />
136+
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
137137
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.1.0-alpha01@aar" level="project" />
138+
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
138139
<orderEntry type="library" name="Gradle: androidx.paging:paging-runtime:2.1.0@aar" level="project" />
139140
<orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0-alpha01@aar" level="project" />
140-
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
141141
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
142-
<orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.1@aar" level="project" />
143-
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
144142
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
145143
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
144+
<orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0-alpha06@aar" level="project" />
145+
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0-alpha01@aar" level="project" />
146+
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0-alpha01@aar" level="project" />
147+
<orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.1@aar" level="project" />
146148
<orderEntry type="library" name="Gradle: androidx.core:core:1.1.0-alpha05@aar" level="project" />
147149
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process:2.1.0-alpha04@aar" level="project" />
148150
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-service:2.1.0-alpha04@aar" level="project" />
149151
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0-alpha04@aar" level="project" />
150152
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0-alpha02@aar" level="project" />
151-
<orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0-alpha02@aar" level="project" />
152153
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.1.0-alpha04@aar" level="project" />
153154
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.1.0-alpha04@aar" level="project" />
155+
<orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0-alpha02@aar" level="project" />
154156
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0-alpha01@aar" level="project" />
157+
<orderEntry type="library" name="Gradle: androidx.sqlite:sqlite-framework:2.0.0@aar" level="project" />
158+
<orderEntry type="library" name="Gradle: androidx.sqlite:sqlite:2.0.0@aar" level="project" />
155159
<orderEntry type="library" name="Gradle: androidx.exifinterface:exifinterface:1.1.0-alpha01@aar" level="project" />
156160
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
157161
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0-alpha04@aar" level="project" />
158-
<orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
159-
<orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
160-
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
161162
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
162163
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
163164
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
165+
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
166+
<orderEntry type="library" name="Gradle: androidx.cardview:cardview:1.0.0@aar" level="project" />
167+
<orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.10.0@aar" level="project" />
164168
<orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
165169
<orderEntry type="library" name="Gradle: pub.devrel:easypermissions:1.0.1@aar" level="project" />
170+
<orderEntry type="library" name="Gradle: com.tzx.json:jsonhandleview:1.2.2@aar" level="project" />
166171
<orderEntry type="library" name="Gradle: com.tencent.bugly:crashreport:3.0.0@aar" level="project" />
167172
<orderEntry type="library" name="Gradle: com.tencent.bugly:nativecrashreport:3.7.1@aar" level="project" />
168173
<orderEntry type="library" name="Gradle: cn.bingoogolapple:bga-qrcode-zxing:1.3.4@aar" level="project" />

‎bus-compiler/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import org.gradle.internal.jvm.Jvm
1515
apply from: "${project.rootDir}/config-compiler.gradle"
1616
dependencies {
1717
compileOnly files(Jvm.current().getToolsJar())
18-
implementation project(':bus-lib')
19-
implementation rootProject.ext.dependencies["auto-service"]
18+
api project(':bus-lib')
19+
api rootProject.ext.dependencies["javapoet"]
20+
api rootProject.ext.dependencies["auto-service"]
2021
annotationProcessor rootProject.ext.dependencies["auto-service"]
21-
implementation rootProject.ext.dependencies["javapoet"]
2222
}

‎bus-compiler/bus-compiler.iml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
<orderEntry type="sourceFolder" forTests="false" />
3232
<orderEntry type="module" module-name="bus-lib" exported="" />
3333
<orderEntry type="module" module-name="lib-core" exported="" />
34-
<orderEntry type="library" exported="" name="Gradle: auto-service-1.0-rc2" level="project" />
3534
<orderEntry type="library" exported="" name="Gradle: javapoet-1.11.1" level="project" />
35+
<orderEntry type="library" exported="" name="Gradle: auto-service-1.0-rc2" level="project" />
3636
<orderEntry type="library" exported="" name="Gradle: auto-common-0.3" level="project" />
3737
<orderEntry type="library" exported="" name="Gradle: guava-18.0" level="project" />
3838
<orderEntry type="library" exported="" name="Gradle: fastjson-1.1.71.android" level="project" />
3939
<orderEntry type="library" exported="" scope="PROVIDED" name="Gradle: tools" level="project" />
40+
<orderEntry type="library" exported="" name="Gradle: bus-compiler.bus-compiler-sources" level="project" />
41+
<orderEntry type="library" exported="" name="Gradle: bus-compiler.bus-compiler-javadoc" level="project" />
4042
</component>
4143
</module>

‎bus-core/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
apply from: "${project.rootDir}/config-aar.gradle"
1414
dependencies {
1515
api project(':bus-lib')
16-
implementation rootProject.ext.dependencies["appcompat"]
17-
implementation rootProject.ext.dependencies["lifecycle"]
18-
implementation rootProject.ext.dependencies["livedata"]
16+
api rootProject.ext.dependencies["appcompat"]
17+
api rootProject.ext.dependencies["lifecycle"]
18+
api rootProject.ext.dependencies["livedata"]
1919
}

‎bus-core/bus-core.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,32 +97,32 @@
9797
<orderEntry type="library" name="Gradle: androidx.concurrent:concurrent-futures:1.0.0-alpha02@jar" level="project" />
9898
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0-beta01@jar" level="project" />
9999
<orderEntry type="library" name="Gradle: com.google.guava:listenablefuture:1.0@jar" level="project" />
100-
<orderEntry type="library" name="Gradle: androidx.databinding:databinding-adapters:3.6.2@aar" level="project" />
101-
<orderEntry type="library" name="Gradle: androidx.databinding:databinding-runtime:3.6.2@aar" level="project" />
102-
<orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
103-
<orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:3.6.2@aar" level="project" />
104100
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0-alpha04@aar" level="project" />
105101
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.1.0-alpha04@aar" level="project" />
106102
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0-alpha06@aar" level="project" />
103+
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
104+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.1.0-alpha04@aar" level="project" />
105+
<orderEntry type="library" name="Gradle: androidx.databinding:databinding-adapters:3.6.2@aar" level="project" />
106+
<orderEntry type="library" name="Gradle: androidx.databinding:databinding-runtime:3.6.2@aar" level="project" />
107+
<orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
107108
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0-alpha04@aar" level="project" />
108109
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
109110
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
110-
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
111111
<orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0-alpha06@aar" level="project" />
112112
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0-alpha01@aar" level="project" />
113113
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0-alpha01@aar" level="project" />
114114
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
115115
<orderEntry type="library" name="Gradle: androidx.core:core:1.1.0-alpha05@aar" level="project" />
116+
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
117+
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0-alpha02@aar" level="project" />
116118
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process:2.1.0-alpha04@aar" level="project" />
117119
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-service:2.1.0-alpha04@aar" level="project" />
118120
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0-alpha04@aar" level="project" />
119-
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0-alpha02@aar" level="project" />
120-
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
121-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.1.0-alpha04@aar" level="project" />
122121
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.1.0-alpha04@aar" level="project" />
123122
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0-alpha01@aar" level="project" />
124123
<orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0-alpha02@aar" level="project" />
125124
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0-alpha04@aar" level="project" />
125+
<orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:3.6.2@aar" level="project" />
126126
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
127127
<orderEntry type="module" module-name="bus-lib" />
128128
<orderEntry type="module" module-name="lib-core" />

‎bus-lib/bus-lib.iml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@
3131
<orderEntry type="sourceFolder" forTests="false" />
3232
<orderEntry type="module" module-name="lib-core" exported="" />
3333
<orderEntry type="library" exported="" name="Gradle: fastjson-1.1.71.android" level="project" />
34+
<orderEntry type="library" exported="" name="Gradle: bus-lib.bus-lib-sources" level="project" />
35+
<orderEntry type="library" exported="" name="Gradle: bus-lib.bus-lib-javadoc" level="project" />
3436
</component>
3537
</module>

‎cat-core/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
apply from: "${project.rootDir}/config-aar.gradle"
1414
dependencies {
1515
api project(':app-core')
16-
implementation rootProject.ext.dependencies["okhttp3"]
17-
implementation rootProject.ext.dependencies["legacy"]
18-
implementation rootProject.ext.dependencies["room-runtime"]
19-
implementation rootProject.ext.dependencies["jsonhandleview"]
16+
api rootProject.ext.dependencies["okhttp3"]
17+
api rootProject.ext.dependencies["legacy"]
18+
api rootProject.ext.dependencies["room-runtime"]
19+
api rootProject.ext.dependencies["jsonhandleview"]
2020
annotationProcessor rootProject.ext.dependencies["room-compiler"]
2121
}

0 commit comments

Comments
 (0)