Skip to content

Commit 6da8f6e

Browse files
committed
see 09/29 log
1 parent 3cb2589 commit 6da8f6e

File tree

28 files changed

+271
-148
lines changed

28 files changed

+271
-148
lines changed

README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.3-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.4-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.3-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.4-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id "com.android.application"
3+
// id "com.blankj.bus"
34
}
45

56
// in config.gradle

app/src/main/java/com/blankj/androidutilcode/Config.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import android.os.Environment;
44

5+
import com.blankj.utilcode.util.BusUtils;
6+
import com.blankj.utilcode.util.ToastUtils;
57
import com.blankj.utilcode.util.Utils;
68

79
import java.io.File;
@@ -14,7 +16,7 @@
1416
* desc : config about constants
1517
* </pre>
1618
*/
17-
public class Config {
19+
public class Config implements BusUtils.IBus {
1820

1921
public static final String FILE_SEP = System.getProperty("file.separator");
2022
public static final String LINE_SEP = System.getProperty("line.separator");
@@ -35,4 +37,14 @@ public class Config {
3537
TEST_APK_PATH = CACHE_PATH + FILE_SEP + "test_install.apk";
3638

3739
}
40+
41+
@Override
42+
public String getName() {
43+
return "Config";
44+
}
45+
46+
@Override
47+
public void onEvent() {
48+
ToastUtils.showShort("config");
49+
}
3850
}

app/src/main/res_core/layout-land/activity_screen_adapt.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:layout_width="match_parent"
45
android:layout_height="match_parent"
5-
android:background="@color/white">
6+
android:background="@color/white"
7+
tools:ignore="MissingDefaultResource">
68

79
<RelativeLayout
810
android:layout_width="2000dp"

app/src/main/res_core/layout-port/activity_screen_adapt.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:layout_width="match_parent"
45
android:layout_height="match_parent"
5-
android:background="@color/white">
6+
android:background="@color/white"
7+
tools:ignore="MissingDefaultResource">
68

79
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
810
android:layout_width="match_parent"

buildSrc/build.gradle

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
apply plugin: 'groovy'
1+
plugins {
2+
id 'groovy'
3+
id 'java-gradle-plugin'
4+
}
5+
6+
gradlePlugin {
7+
plugins {
8+
readmeCore {
9+
id = 'readme-core'
10+
implementationClass = 'com.blankj.plugin.ReadmeCorePlugin'
11+
}
12+
13+
readmeSub {
14+
id = 'readme-sub'
15+
implementationClass = 'com.blankj.plugin.ReadmeSubPlugin'
16+
}
17+
}
18+
}
219

320
dependencies {
421
compile gradleApi()

buildSrc/src/main/groovy/com/blankj/plugin/ReadmeCorePlugin.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ class ReadmeCorePlugin implements Plugin<Project> {
1313
doLast {
1414
println "readmeTask start..."
1515

16-
def readmeCN = project['readme'].readmeCnFile
17-
def readmeEng = project['readme'].readmeFile
16+
def ext = project['readme'] as ReadmeExtension
17+
def readmeCN = ext.readmeCnFile
18+
def readmeEng = ext.readmeFile
19+
1820
readmeOfUtilCode2Eng(readmeCN, readmeEng)
1921

2022
println "readmeTask finished."

buildSrc/src/main/groovy/com/blankj/plugin/ReadmeSubPlugin.groovy

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package com.blankj.plugin
33
import org.gradle.api.Plugin
44
import org.gradle.api.Project
55

6-
import static com.blankj.plugin.FormatUtils.LINE_SEP;
6+
import static FormatUtils.LINE_SEP;
7+
78

89
class ReadmeSubPlugin implements Plugin<Project> {
910

@@ -15,8 +16,10 @@ class ReadmeSubPlugin implements Plugin<Project> {
1516
doLast {
1617
println "readmeTask start..."
1718

18-
def readmeCN = project['readme'].readmeCnFile
19-
def readmeEng = project['readme'].readmeFile
19+
def ext = project['readme'] as ReadmeExtension
20+
def readmeCN = ext.readmeCnFile
21+
def readmeEng = ext.readmeFile
22+
2023
readmeOfSubUtil2Eng(readmeCN, readmeEng)
2124

2225
println "readmeTask finished."

buildSrc/src/main/resources/META-INF/gradle-plugins/com.blankj.readme.core.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

buildSrc/src/main/resources/META-INF/gradle-plugins/com.blankj.readme.sub.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

config.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ ext {
66
compileSdkVersion: 27,
77
minSdkVersion : 14,
88
targetSdkVersion : 27,
9-
versionCode : 1_020_003,
10-
versionName : '1.20.3'// E.g. 1.9.72 => 1,009,072
9+
versionCode : 1_020_004,
10+
versionName : '1.20.4'// E.g. 1.9.72 => 1,009,072
1111
]
1212

1313
versionConfig = [
1414
// plugin
15-
gradle : '3.1.3',
15+
gradle : '3.2.0',
1616
kotlin : '1.2.30',
1717
// lib
18-
support : '27.1.0',
18+
support : '27.1.1',
1919
gson : '2.8.2',
2020
glide : '4.7.1',
2121
leakcanary : '1.5.4',
File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Mar 31 15:05:28 CST 2018
1+
#Tue Sep 25 11:43:49 CST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

subutil/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
apply {
2-
plugin('com.android.library')
3-
from('readme.gradle')
1+
plugins {
2+
id "com.android.library"
3+
id "readme-sub"
44
}
55

66
// in config.gradle
77
configAndroidDomain project
8-
configSubUtilDependencies project
8+
configSubUtilDependencies project
9+
10+
readme {
11+
readmeFile file('README.md')
12+
readmeCnFile file('README-CN.md')
13+
}

subutil/readme.gradle

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.blankj.subutil.util;
2+
3+
/**
4+
* <pre>
5+
* author: Blankj
6+
* blog : http://blankj.com
7+
* time : 2018/08/25
8+
* desc : utils about retrofit
9+
* </pre>
10+
*/
11+
public final class RetrofitUtils {
12+
13+
}

0 commit comments

Comments
 (0)