Skip to content

Commit 9a0a9e5

Browse files
DovSnierDovSnier
authored
Merge pull request #40 from DovSnier/developer
[DONE]合并分支
2 parents 207833a + 3691d25 commit 9a0a9e5

47 files changed

Lines changed: 2365 additions & 112 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ gen/
1818
# Gradle files
1919
.gradle/
2020
build/
21+
*.txt
22+
*.log
2123

2224
# Local configuration file (sdk path, etc)
2325
local.properties

‎README.md‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,130 @@
11
# Test
2+
23
个人项目
4+
5+
## 一. 项目目录图
6+
7+
```
8+
+--- project :app
9+
| +--- dir :common
10+
| | \--- project :common:bean
11+
| | \--- project :common:utils
12+
| +--- dir :framework
13+
| | \--- project :framework:base
14+
| | \--- project :framework:doc
15+
| | \--- project :framework:style
16+
| \--- dir :research
17+
| \--- project :research:common
18+
| \--- project :research:interceptor
19+
| \--- project :research:provider
20+
| \--- project :research:service
21+
| \--- project :research:tpl
22+
| \--- project :research:view
23+
| \--- project :research:widget
24+
25+
```
26+
27+
## 二. 项目依赖图
28+
29+
```
30+
+--- app
31+
| +--- project :framework:base
32+
| | \--- project :common:utils
33+
| | \--- project :framework:style
34+
| \--- project :common:bean
35+
| +--- project :research:interceptor
36+
| +--- project :research:view
37+
| | +--- project :framework:base (*)
38+
| | \--- project :framework:style (t)
39+
| | \--- project :framework:utils (t)
40+
| +--- project :research:widget
41+
| | +--- project :framework:base (*)
42+
| | \--- project :framework:style (t)
43+
| | \--- project :framework:utils (t)
44+
| +--- project :research:common
45+
| | +--- project :framework:base (*)
46+
| | \--- project :framework:style (t)
47+
| | \--- project :framework:utils (t)
48+
| +--- project :research:tpl
49+
| | +--- project :framework:base (*)
50+
| | \--- project :framework:style (t)
51+
| | \--- project :framework:utils (t)
52+
| | \--- project :common:bean
53+
| \--- project :research:service
54+
| +--- project :framework:base (*)
55+
| \--- project :framework:style (t)
56+
| \--- project :framework:utils (t)
57+
|
58+
+--- project :research:common (*)
59+
+--- project :research:service (*)
60+
+--- project :framework:style
61+
+--- project :research:tpl (*)
62+
+--- project :research:utils
63+
+--- project :research:view (*)
64+
\--- project :research:widget (*)
65+
66+
67+
(*) - dependencies omitted (listed previously)
68+
(n) - Not resolved (configuration is not meant to be resolved)
69+
(t) - transitive dependencies and that not directly dependent
70+
```
71+
72+
73+
74+
75+
76+
77+
78+
79+
80+
81+
82+
83+
84+
85+
86+
87+
88+
89+
90+
91+
92+
93+
94+
95+
96+
97+
98+
99+
100+
101+
102+
103+
104+
105+
106+
107+
108+
109+
110+
111+
112+
113+
114+
115+
116+
117+
118+
119+
120+
121+
122+
123+
124+
125+
126+
127+
128+
129+
130+

‎app/build.gradle‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,20 @@ task exportAppInfo() {
157157

158158
dependencies {
159159
implementation fileTree(include: ['*.jar'], dir: 'libs')
160-
api project(':framework:base')
160+
implementation project(':framework:base')
161161
implementation project(':common:bean')
162162
implementation project(':research:interceptor')
163163

164164
implementation "com.android.support:appcompat-v7:$rootProject.support_appcompat_version"
165165
implementation "com.android.support:support-annotations:$rootProject.support_annotations_version"
166166

167-
//noinspection GradleDependency
168-
implementation "com.jakewharton:butterknife:$rootProject.butterknife_version"
169-
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknife_compiler_version"
167+
implementation("com.jakewharton:butterknife:$rootProject.butterknife_version") {
168+
exclude group: 'com.android.support', module: 'support-annotations'
169+
exclude group: 'com.android.support', module: 'support-compat'
170+
}
171+
annotationProcessor("com.jakewharton:butterknife-compiler:$rootProject.butterknife_compiler_version") {
172+
// transitive = false
173+
}
170174
implementation "com.squareup.retrofit2:retrofit:$rootProject.retrofit_version"
171175

172176
implementation "com.facebook.stetho:stetho:$rootProject.stetho_version"
@@ -179,4 +183,10 @@ dependencies {
179183
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$rootProject.leakcanary_android_no_op_version"
180184

181185
// implementation "com.android.tools.build:gradle:$build_gradle_version"
186+
187+
configurations {
188+
// force = true
189+
// transitive = false
190+
// all*.exclude group: 'com.android.support'
191+
}
182192
}

‎build.gradle‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@ apply plugin: "ua.eshepelyuk.ManifestClasspath"
77

88
buildscript {
99

10-
ext.build_gradle_version = '3.3.2'
11-
ext.greendao_gradle_plugin_version = '3.2.2'
12-
ext.butterknife_gradle_plugin_version = '9.0.0'
13-
1410
repositories {
15-
// maven { url "https://jitpack.io" }
1611
maven { url "https://maven.aliyun.com/repository/public" }
17-
maven { url "https://plugins.gradle.org/m2/" }
12+
maven { url "https://maven.aliyun.com/repository/google" }
13+
maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
14+
// maven { url "https://plugins.gradle.org/m2/" }
1815
mavenCentral()
1916
mavenLocal()
2017
google()
@@ -35,7 +32,9 @@ buildscript {
3532
allprojects {
3633
repositories {
3734
maven { url "https://maven.aliyun.com/repository/public" }
38-
maven { url "https://plugins.gradle.org/m2/" }
35+
maven { url "https://maven.aliyun.com/repository/google" }
36+
maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
37+
// maven { url "https://plugins.gradle.org/m2/" }
3938
mavenCentral()
4039
mavenLocal()
4140
google()

‎common/bean/build.gradle‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,18 @@ greendao {
3030
dependencies {
3131
implementation fileTree(dir: 'libs', include: ['*.jar'])
3232

33-
implementation "com.dvsnier:base:$rootProject.base_version"
33+
implementation("com.dvsnier:base:$rootProject.base_version") {
34+
exclude group: 'com.android.support', module: 'recyclerview-v7'
35+
exclude group: 'com.android.support', module: 'support-annotations'
36+
}
3437
api "org.greenrobot:greendao:$rootProject.greendao_version"
3538

3639
testImplementation "junit:junit:$rootProject.junit_version"
3740

38-
androidTestImplementation "com.android.support.test:runner:$rootProject.runner_version"
39-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version"
41+
androidTestImplementation("com.android.support.test:runner:$rootProject.runner_version") {
42+
transitive = false
43+
}
44+
androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version") {
45+
transitive = false
46+
}
4047
}

‎common/utils/build.gradle‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,30 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828

29-
implementation "com.android.support:appcompat-v7:$rootProject.support_appcompat_version"
29+
implementation("com.android.support:appcompat-v7:$rootProject.support_appcompat_version") {
30+
exclude group: 'com.android.support', module: 'support-annotations'
31+
exclude group: 'com.android.support', module: 'support-core-utils'
32+
exclude group: 'com.android.support', module: 'support-fragment'
33+
exclude group: 'com.android.support', module: 'support-vector-drawable'
34+
exclude group: 'com.android.support', module: 'animated-vector-drawable'
35+
}
3036
implementation "com.android.support:support-annotations:$rootProject.support_annotations_version"
3137

32-
api "org.xutils:xutils:${rootProject.xutils_version}"
38+
api("org.xutils:xutils:${rootProject.xutils_version}") {
39+
transitive = false
40+
}
3341
api("com.dvsnier:utils:${rootProject.utils_version}") {
3442
exclude group: 'com.android.support', module: 'appcompat-v7'
3543
exclude group: 'com.android.support', module: 'support-annotations'
44+
// exclude group: 'com.google.code.gson', module: 'gson'
3645
}
3746

3847
testImplementation "junit:junit:$rootProject.junit_version"
3948

40-
androidTestImplementation "com.android.support.test:runner:$rootProject.runner_version"
41-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version"
49+
androidTestImplementation("com.android.support.test:runner:$rootProject.runner_version") {
50+
transitive = false
51+
}
52+
androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version") {
53+
transitive = false
54+
}
4255
}

‎dependencies.gradle‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
ext {
22

3-
//编译环境
4-
build_gradle_version = '3.1.2'
53
compile_sdk_version = 28
64
build_tools_version = '28.0.3'
75

@@ -10,10 +8,10 @@ ext {
108
target_sdk_version = 28
119
version_code = 23 // deprecated
1210
version_name = "0.1.0" // deprecated
13-
version_app_code = 25
14-
version_app_name = "0.1.1"
15-
version_base_code = 4
16-
version_base_name = "0.0.3"
11+
version_app_code = 30
12+
version_app_name = "0.1.3"
13+
version_base_code = 5
14+
version_base_name = "0.0.4"
1715
version_bean_code = 4
1816
version_bean_name = "0.0.4"
1917
version_utils_code = 5
@@ -30,8 +28,8 @@ ext {
3028
version_widget_name = "0.0.8"
3129
version_view_code = 4
3230
version_view_name = "0.0.4"
33-
version_common_code = 3
34-
version_common_name = "0.0.3"
31+
version_common_code = 5
32+
version_common_name = "0.0.5"
3533
version_service_code = 1
3634
version_service_name = "0.0.1"
3735
version_provider_code = 1
@@ -40,13 +38,13 @@ ext {
4038
version_tpl_name = "0.0.6"
4139

4240
// support SDK 配置
43-
support_annotations_version = "28.0.0"
44-
support_compat_version = "28.0.0"
45-
support_appcompat_version = "28.0.0"
46-
support_v4_version = "28.0.0"
47-
support_recyclerview_version = "28.0.0"
41+
support_annotations_version = "28.0.0-alpha1"
42+
support_compat_version = "28.0.0-alpha1"
43+
support_appcompat_version = "28.0.0-alpha1"
44+
support_v4_version = "28.0.0-alpha1"
45+
support_recyclerview_version = "28.0.0-alpha1"
4846
support_constraint_layout_version = "1.1.3"
49-
support_design_version = "28.0.0"
47+
support_design_version = "28.0.0-alpha1"
5048
support_multidex_version = "1.0.3"
5149
junit_version = "4.13-beta-3"
5250
runner_version = "1.0.2"
@@ -59,7 +57,8 @@ ext {
5957
common_version = "0.0.3"
6058
cache_version = "0.2.1"
6159
utils_version = "0.0.4"
62-
crash_monitor_version = "0.0.4"
60+
crash_monitor_version = "0.0.6"
61+
no_crash_version = "0.0.4"
6362
butterknife_version = "9.0.0"
6463
butterknife_compiler_version = "9.0.0"
6564
retrofit_version = "2.0.2"

‎framework/base/build.gradle‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ dependencies {
3838

3939
debugApi("com.dvsnier:crash:$rootProject.crash_monitor_version") {
4040
exclude group: 'com.android.support', module: 'support-annotations'
41+
exclude group: 'com.android.support', module: 'support-v4'
4142
}
42-
releaseApi("com.dvsnier:crash-no:$rootProject.crash_monitor_version") {
43+
releaseApi("com.dvsnier:crash-no:$rootProject.no_crash_version") {
4344
exclude group: 'com.android.support', module: 'support-annotations'
4445
}
4546

@@ -48,15 +49,22 @@ dependencies {
4849
}
4950

5051
api "com.android.support:multidex:$rootProject.support_multidex_version"
51-
implementation "com.android.support:appcompat-v7:$rootProject.support_appcompat_version"
52-
implementation "com.android.support:support-annotations:$rootProject.support_annotations_version"
53-
//noinspection GradleDependency
54-
implementation "com.jakewharton:butterknife:$rootProject.butterknife_version"
52+
5553
implementation "com.jakewharton:disklrucache:$rootProject.disklrucache_version"
56-
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknife_compiler_version"
54+
implementation("com.jakewharton:butterknife:$rootProject.butterknife_version") {
55+
exclude group: 'com.android.support', module: 'support-annotations'
56+
exclude group: 'com.android.support', module: 'support-compat'
57+
}
58+
annotationProcessor("com.jakewharton:butterknife-compiler:$rootProject.butterknife_compiler_version") {
59+
// transitive = false
60+
}
5761

5862
implementation "junit:junit:$rootProject.junit_version"
5963

60-
androidTestImplementation "com.android.support.test:runner:$rootProject.runner_version"
61-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version"
64+
androidTestImplementation("com.android.support.test:runner:$rootProject.runner_version") {
65+
transitive = false
66+
}
67+
androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version") {
68+
transitive = false
69+
}
6270
}

‎framework/base/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
<resources>
22
<string name="app_name">base</string>
3+
<string name="mime_type">TYPE_TEXT</string>
34
</resources>

‎framework/doc/build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ dependencies {
2828

2929
testImplementation "junit:junit:$rootProject.junit_version"
3030

31-
androidTestImplementation "com.android.support.test:runner:$rootProject.runner_version"
32-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version"
31+
androidTestImplementation("com.android.support.test:runner:$rootProject.runner_version") {
32+
transitive = false
33+
}
34+
androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espresso_core_version") {
35+
transitive = false
36+
}
3337
}

0 commit comments

Comments
 (0)