Skip to content

Commit 46ab72c

Browse files
authored
Merge pull request #56 from alibaba/develop
Update doc and set support package version
2 parents 8f308f2 + c9760cb commit 46ab72c

6 files changed

Lines changed: 11 additions & 10 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@
127127
@Autowired
128128
public String name;
129129
@Autowired
130-
private int age;
130+
int age;
131131
@Autowired(name = "girl") // 通过name来映射URL中的不同参数
132-
private boolean boy;
132+
boolean boy;
133133

134134
@Override
135135
protected void onCreate(Bundle savedInstanceState) {

README_CN.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
}
6565

6666
3. 初始化SDK
67+
6768
if (isDebug()) {
6869
ARouter.openLog(); // 打印日志
6970
ARouter.openDebug(); // 开启调试模式(如果在InstantRun模式下运行,必须开启调试模式!线上版本需要关闭,否则有安全风险)
@@ -124,9 +125,9 @@
124125
@Autowired
125126
public String name;
126127
@Autowired
127-
private int age;
128+
int age;
128129
@Autowired(name = "girl") // 通过name来映射URL中的不同参数
129-
private boolean boy;
130+
boolean boy;
130131

131132
@Override
132133
protected void onCreate(Bundle savedInstanceState) {

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ dependencies {
5555
compile project(':test-module-1')
5656
compile project(':arouter-annotation')
5757

58-
compile 'com.android.support:appcompat-v7:22.2.0'
59-
compile 'com.android.support:support-v4:23.4.0'
58+
compile "com.android.support:support-v4:${SUPPORT_LIB_VERSION}"
59+
compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
6060
}

arouter-api/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141
dependencies {
4242
annotationProcessor 'com.alibaba:arouter-compiler:1.0.3'
4343
compile 'com.alibaba:arouter-annotation:1.0.2'
44-
compile 'com.android.support:support-v4:25.2.0'
44+
compile "com.android.support:support-v4:${SUPPORT_LIB_VERSION}"
4545
}
4646

4747
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ org.gradle.daemon=true
2020

2121
COMPILE_SDK_VERSION=25
2222
BUILDTOOLS_VERSION=25.0.0
23+
SUPPORT_LIB_VERSION=25.2.0
2324
MIN_SDK_VERSION=12
2425
TARGET_SDK_VERSION=25
2526

test-module-1/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ apply plugin: 'com.android.library'
22

33
dependencies {
44
compile project(':arouter-api')
5-
6-
compile 'com.android.support:appcompat-v7:23.4.0'
7-
annotationProcessor 'com.alibaba:arouter-compiler:1.0.1'
5+
compile "com.android.support:appcompat-v7:${SUPPORT_LIB_VERSION}"
6+
annotationProcessor 'com.alibaba:arouter-compiler:1.0.3'
87
}
98
android {
109
compileSdkVersion Integer.parseInt(COMPILE_SDK_VERSION)

0 commit comments

Comments
 (0)