Skip to content

Commit 41cbd28

Browse files
hzlgithzlgit
committed
修复bug，升级RN版本
1 parent 7be2838 commit 41cbd28

File tree

28 files changed

+496
-109
lines changed

28 files changed

+496
-109
lines changed

‎android/build.gradle‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
apply plugin: 'com.android.library'
2-
2+
def DEFAULT_COMPILE_SDK_VERSION = 27
3+
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
4+
def DEFAULT_TARGET_SDK_VERSION = 27
5+
def DEFAULT_MIN_SDK_VERSION = 16
6+
def DEFAULT_SUPPOR_LIBVERSION = "27.0.3"
37
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
8+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
9+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
610
flavorDimensions "prod"
711

812
defaultConfig {
9-
minSdkVersion 16
10-
targetSdkVersion 25
13+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
14+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
1115
versionCode 1
1216
versionName "1.0"
1317

@@ -27,17 +31,15 @@ dependencies {
2731
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
2832
exclude group: 'com.android.support', module: 'support-annotations'
2933
})
30-
// compile 'cn.jiguang.imui:messagelist:0.3.1-beta'
31-
// compile 'cn.jiguang.imui:chatinput:0.3.4-beta'
32-
compile 'com.android.support:appcompat-v7:25.3.1'
33-
compile 'com.facebook.react:react-native:+'
34-
compile 'com.google.code.gson:gson:2.3.1'
34+
implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
35+
implementation "com.android.support:design:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
36+
implementation 'com.facebook.react:react-native:+'
37+
implementation 'com.google.code.gson:gson:2.3.1'
3538

36-
compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
37-
compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
38-
//compile 'com.dinuscxj:recyclerrefreshlayout:2.0.5'
39-
compile 'com.google.zxing:core:3.3.0'
40-
compile 'com.github.bumptech.glide:glide:3.7.0'
39+
implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
40+
implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
41+
implementation 'com.google.zxing:core:3.3.0'
42+
implementation 'com.github.bumptech.glide:glide:3.7.0'
4143
testCompile 'junit:junit:4.12'
4244
compile project(':react-native-imui:chatinput')
4345
compile project(':react-native-imui:messagelist')

‎android/chatinput/build.gradle‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
apply plugin: 'com.android.library'
2-
2+
def DEFAULT_COMPILE_SDK_VERSION = 27
3+
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
4+
def DEFAULT_TARGET_SDK_VERSION = 27
5+
def DEFAULT_MIN_SDK_VERSION = 16
6+
def DEFAULT_SUPPOR_LIBVERSION = "27.0.3"
37
ext {
48
PUBLISH_GROUP_ID = 'cn.jiguang.imui'
59
PUBLISH_ARTIFACT_ID = 'chatinput'
610
PUBLISH_VERSION = '0.3.4-beta'
711
}
812

913
android {
10-
compileSdkVersion 25
11-
buildToolsVersion "25.0.2"
14+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
15+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
1216
defaultConfig {
13-
minSdkVersion 16
14-
targetSdkVersion 25
17+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
18+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
1519
versionCode 2
1620
versionName "0.1.1"
1721
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -32,15 +36,15 @@ android {
3236
dependencies {
3337
compile fileTree(include: ['*.jar'], dir: 'libs')
3438

35-
compile project(':react-native-imui:emoji')
39+
implementation project(':react-native-imui:emoji')
3640
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
3741
exclude group: 'com.android.support', module: 'support-annotations'
3842
})
39-
compile 'com.android.support:appcompat-v7:25.3.1'
40-
compile 'com.android.support:design:25.3.1'
41-
compile 'com.google.android:flexbox:0.2.5'
42-
compile 'com.github.bumptech.glide:glide:3.7.0'
43-
compile 'com.android.support:support-v4:25.3.1'
43+
implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
44+
implementation "com.android.support:design:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
45+
implementation 'com.google.android:flexbox:0.2.5'
46+
implementation 'com.github.bumptech.glide:glide:3.7.0'
47+
implementation "com.android.support:support-v4:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
4448
testCompile 'junit:junit:4.12'
4549
}
4650

‎android/emoji/build.gradle‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
apply plugin: 'com.android.library'
2-
2+
def DEFAULT_COMPILE_SDK_VERSION = 27
3+
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
4+
def DEFAULT_TARGET_SDK_VERSION = 27
5+
def DEFAULT_MIN_SDK_VERSION = 16
6+
def DEFAULT_SUPPOR_LIBVERSION = "27.0.3"
37
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "26.0.0"
8+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
9+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
610

711
defaultConfig {
8-
minSdkVersion 9
9-
targetSdkVersion 25
12+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
13+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
1014
versionCode 1
1115
versionName "1.0"
1216

@@ -22,11 +26,11 @@ android {
2226
}
2327

2428
dependencies {
25-
compile fileTree(dir: 'libs', include: ['*.jar'])
29+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2630
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
2731
exclude group: 'com.android.support', module: 'support-annotations'
2832
})
29-
compile 'com.android.support:appcompat-v7:25.3.1'
30-
compile 'com.github.bumptech.glide:glide:3.7.0'
33+
implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
34+
implementation 'com.github.bumptech.glide:glide:3.7.0'
3135
testCompile 'junit:junit:4.12'
3236
}

‎android/messagelist/build.gradle‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
apply plugin: 'com.android.library'
22

3+
def DEFAULT_COMPILE_SDK_VERSION = 27
4+
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
5+
def DEFAULT_TARGET_SDK_VERSION = 27
6+
def DEFAULT_MIN_SDK_VERSION = 16
7+
def DEFAULT_SUPPOR_LIBVERSION = "27.0.3"
38
ext {
49
PUBLISH_GROUP_ID = 'cn.jiguang.imui'
510
PUBLISH_ARTIFACT_ID = 'messagelist'
611
PUBLISH_VERSION = '0.4.2'
712
}
813

914
android {
10-
compileSdkVersion 25
11-
buildToolsVersion "25.0.2"
15+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
16+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
1217
defaultConfig {
13-
minSdkVersion 16
14-
targetSdkVersion 25
18+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
19+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
1520
versionCode 2
1621
versionName "0.1.1"
1722
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -26,14 +31,15 @@ dependencies {
2631
compile fileTree(include: ['*.jar'], dir: 'libs')
2732
compile project(':react-native-imui:emoji')
2833
compile project(':react-native-imui:photoViewPagerview')
29-
34+
implementation 'com.facebook.fresco:fresco:1.13.0'
35+
implementation 'me.relex:photodraweeview:1.1.3'
3036
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
3137
exclude group: 'com.android.support', module: 'support-annotations'
3238
})
3339

34-
compile 'com.android.support:appcompat-v7:25.3.1'
35-
compile 'com.android.support:design:25.3.1'
36-
compile 'com.android.support:support-v4:25.3.1'
40+
implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
41+
implementation "com.android.support:design:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
42+
implementation "com.android.support:support-v4:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
3743
testCompile 'junit:junit:4.12'
3844
}
3945

‎android/photoViewPagerview/build.gradle‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
apply plugin: 'com.android.library'
2-
2+
def DEFAULT_COMPILE_SDK_VERSION = 27
3+
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
4+
def DEFAULT_TARGET_SDK_VERSION = 27
5+
def DEFAULT_MIN_SDK_VERSION = 16
6+
def DEFAULT_SUPPOR_LIBVERSION = "27.0.3"
37
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
8+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
9+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
610

711
defaultConfig {
8-
minSdkVersion 16
9-
targetSdkVersion 23
12+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
13+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
1014
versionCode 1
1115
versionName "1.0"
1216
}
@@ -20,10 +24,7 @@ android {
2024

2125
dependencies {
2226
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
// compile 'me.relex:circleindicator:1.2.2'
24-
compile 'com.facebook.fresco:fresco:1.0.1'
25-
compile 'me.relex:photodraweeview:1.1.3'
26-
// compile 'com.facebook.react:react-native:+'
27-
compile 'com.android.support:appcompat-v7:23.4.0'
28-
// compile project(':react-native-imui:photoViewPagerview:photodraweeview')
27+
implementation 'com.facebook.fresco:fresco:1.13.0'
28+
implementation 'me.relex:photodraweeview:1.1.3'
29+
implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
2930
}

‎android/photoViewPagerview/photodraweeview/build.gradle‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
apply plugin: 'com.android.library'
2-
2+
def DEFAULT_COMPILE_SDK_VERSION = 27
3+
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
4+
def DEFAULT_TARGET_SDK_VERSION = 27
5+
def DEFAULT_MIN_SDK_VERSION = 16
6+
def DEFAULT_SUPPOR_LIBVERSION = "27.0.3"
37
version = "1.1.2"
48
def int version_code = 112
59

610
android {
7-
compileSdkVersion 23
8-
buildToolsVersion "23.0.1"
11+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
12+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
913

1014
defaultConfig {
11-
minSdkVersion 14
12-
//targetSdkVersion 23
15+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
16+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
1317
versionCode version_code
1418
versionName version
1519
}
@@ -22,8 +26,8 @@ android {
2226
}
2327

2428
dependencies {
25-
compile 'com.facebook.fresco:fresco:1.3.0'
26-
compile 'com.android.support:appcompat-v7:23.4.0'
29+
implementation 'com.facebook.fresco:fresco:1.13.0'
30+
implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
2731
}
2832

2933
//apply from: "upload-jcenter.gradle"

‎android/popuptool/build.gradle‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
apply plugin: 'com.android.library'
2-
2+
def DEFAULT_COMPILE_SDK_VERSION = 27
3+
def DEFAULT_BUILD_TOOLS_VERSION = "27.0.3"
4+
def DEFAULT_TARGET_SDK_VERSION = 27
5+
def DEFAULT_MIN_SDK_VERSION = 16
6+
def DEFAULT_SUPPOR_LIBVERSION = "27.0.3"
37
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "26.0.0"
8+
compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
9+
buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
610

711
defaultConfig {
8-
minSdkVersion 16
9-
targetSdkVersion 25
12+
minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
13+
targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
1014
versionCode 1
1115
versionName "1.0"
1216

@@ -22,10 +26,10 @@ android {
2226
}
2327

2428
dependencies {
25-
compile fileTree(dir: 'libs', include: ['*.jar'])
29+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2630
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
2731
exclude group: 'com.android.support', module: 'support-annotations'
2832
})
29-
compile 'com.android.support:appcompat-v7:25.3.1'
33+
implementation "com.android.support:appcompat-v7:${rootProject.hasProperty('supportLibVersion') ? rootProject.supportLibVersion : DEFAULT_SUPPOR_LIBVERSION}"
3034
testCompile 'junit:junit:4.12'
3135
}

‎android/popuptool/src/main/res/drawable-hdpi/aurora_bg_bubble.9.png‎

63 Bytes
Loading

0 commit comments

Comments
 (0)