Skip to content

Commit 6a266af

Browse files
BlankjBlankj
committed
see 09/08 log
1 parent 660d38b commit 6a266af

Some content is hidden

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

58 files changed

+1003
-517
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
* `20/09/06` [add] DebouncingUtils.
2+
* `20/09/04` [fix] ToastUtils adapt SDK 30.
13
* `20/05/28` [fix] IntentUtils#getInstallAppIntent file exist wrong. Publish v1.29.0.
24
* `20/05/23` [fix] BusUtils#postSticky times not right. Publish v1.28.6.
35
* `20/05/22` [add] IntentUtils#getInstallAppIntent support Uri param.

‎README-CN.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[![logo][logo]](https://github.com/Blankj/AndroidUtilCode)
22

3-
<a href="https://tracking.gitads.io/?repo=AndroidUtilCode"> <img src="https://images.gitads.io/AndroidUtilCode" alt="GitAds"/> </a>
4-
53
[![frame][frame]](https://github.com/Blankj/AucFrameTemplate)
64

75
[![auc][aucSvg]][auc] [![result][apiSvg]][result] [![build][buildSvg]][build] [![License][licenseSvg]][license]

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[![logo][logo]](https://github.com/Blankj/AndroidUtilCode)
22

3-
<a href="https://tracking.gitads.io/?repo=AndroidUtilCode"> <img src="https://images.gitads.io/AndroidUtilCode" alt="GitAds"/> </a>
4-
53
[![frame][frame]](https://github.com/Blankj/AucFrameTemplate)
64

75
[![auc][aucSvg]][auc] [![result][apiSvg]][result] [![build][buildSvg]][build] [![License][licenseSvg]][license]

‎build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ buildscript {
44
repositories {
55
// use for debug plugin local
66
if (Config.depConfig.plugin_bus.useLocal || Config.depConfig.plugin_api.useLocal) {
7-
maven() {
8-
url new File("mavenLocal")
9-
}
7+
maven() { url uri("${project.rootDir.path}/mavenLocal") }
108
}
119
google()
1210
jcenter()
@@ -21,6 +19,7 @@ buildscript {
2119

2220
allprojects {
2321
repositories {
22+
maven() { url uri("${project.rootDir.path}/mavenLocal") }
2423
maven { url "https://jitpack.io" }
2524
google()
2625
jcenter()

‎buildApp.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply {
22
plugin "com.android.application"
3-
plugin "kotlin-android"
4-
plugin "kotlin-android-extensions"
3+
from "${rootDir.path}/buildCommon.gradle"
54
if (Config.depConfig.plugin_api.isApply) {
65
plugin Config.depConfig.plugin_api.pluginId
76
}
@@ -26,11 +25,7 @@ if (Config.depConfig.plugin_api.isApply) {
2625
}
2726

2827
android {
29-
compileSdkVersion Config.compileSdkVersion
3028
defaultConfig {
31-
minSdkVersion Config.minSdkVersion
32-
versionCode Config.versionCode
33-
versionName Config.versionName
3429
applicationId Config.applicationId + suffix
3530
targetSdkVersion Config.targetSdkVersion
3631
multiDexEnabled true

‎buildCommon.gradle

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
apply {
2+
plugin "kotlin-android"
3+
plugin "kotlin-android-extensions"
4+
}
5+
6+
android {
7+
compileSdkVersion Config.compileSdkVersion
8+
defaultConfig {
9+
minSdkVersion Config.minSdkVersion
10+
versionCode Config.versionCode
11+
versionName Config.versionName
12+
consumerProguardFiles 'proguard-rules.pro'
13+
}
14+
15+
buildTypes {
16+
release {
17+
minifyEnabled true
18+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
19+
}
20+
}
21+
22+
lintOptions {
23+
abortOnError false
24+
}
25+
26+
// viewBinding {
27+
// enabled = true
28+
// }
29+
30+
// flavorDimensions "region"
31+
//
32+
// productFlavors {
33+
// china {
34+
// dimension "region"
35+
// }
36+
//
37+
// oversea {
38+
// dimension "region"
39+
// }
40+
// }
41+
}

‎buildLib.gradle

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,5 @@
1-
apply {
2-
plugin "com.android.library"
3-
plugin "kotlin-android"
4-
plugin "kotlin-android-extensions"
5-
}
6-
7-
android {
8-
compileSdkVersion Config.compileSdkVersion
9-
defaultConfig {
10-
minSdkVersion Config.minSdkVersion
11-
versionCode Config.versionCode
12-
versionName Config.versionName
13-
consumerProguardFiles 'proguard-rules.pro'
14-
}
15-
16-
buildTypes {
17-
release {
18-
minifyEnabled false
19-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
20-
consumerProguardFiles 'proguard-rules.pro'
21-
}
22-
}
23-
24-
lintOptions {
25-
abortOnError false
26-
}
27-
28-
// viewBinding {
29-
// enabled = true
30-
// }
31-
}
1+
apply plugin: "com.android.library"
2+
apply from: "${rootDir.path}/buildCommon.gradle"
323

334
dependencies {
345
if (project.name.endsWith("_pkg") || project.name.endsWith("_mock")) {

‎buildSrc/src/main/groovy/Config.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Config {
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.0'
22-
static kotlinVersion = '1.3.50'
22+
static kotlinVersion = '1.3.72'
2323
static supportVersion = '28.0.0'
2424

2525
static depConfig = [
@@ -37,7 +37,7 @@ class Config {
3737
feature_subutil_export : new DepConfig(true , true , ":feature:subutil:export"),
3838
feature_utilcode_app : new DepConfig(false, true , ":feature:utilcode:app"),
3939
feature_utilcode_pkg : new DepConfig(true , true , ":feature:utilcode:pkg"),
40-
feature_utilcode_export : new DepConfig(true , true , ":feature:utilcode:export"),
40+
feature_utilcode_export : new DepConfig(true , true , ":feature:utilcode:export", "com.blankj:utilcode-export:1.1"),
4141
lib_base : new DepConfig(true , true , ":lib:base"),
4242
lib_common : new DepConfig(true , true , ":lib:common"),
4343
lib_subutil : new DepConfig(true , true , ":lib:subutil"),

‎config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{"isApply": true, "useLocal": true, "localPath": ":feature:subutil:export"},
1818
{"isApply": true, "useLocal": true, "localPath": ":feature:utilcode:app"},
1919
{"isApply": true, "useLocal": true, "localPath": ":feature:utilcode:pkg"},
20-
{"isApply": true, "useLocal": true, "localPath": ":feature:utilcode:export"},
20+
{"isApply": true, "useLocal": true, "localPath": ":feature:utilcode:export", "remotePath": "com.blankj:utilcode-export:1.1"},
2121
{"isApply": true, "useLocal": true, "localPath": ":lib:base"},
2222
{"isApply": true, "useLocal": true, "localPath": ":lib:common"},
2323
{"isApply": true, "useLocal": true, "localPath": ":lib:subutil"},

‎feature/utilcode/export/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apply from: "${rootDir.path}/gradle/publish.gradle"
2+
publish {
3+
def depConfig = Config.depConfig.feature_utilcode_export
4+
name = "UtilCodeExport"
5+
groupId = depConfig.groupId
6+
artifactId = depConfig.artifactId
7+
version = depConfig.version
8+
website = "https://github.com/Blankj/UtilCodeExport"
9+
}
10+
//./gradlew :feature_utilcode_export:mavenLocal // 上传到本地 mavenLocal

0 commit comments

Comments
 (0)