Skip to content

Commit 8818f10

Browse files
authored
Merge pull request #20 from jpush/dev
Dev
2 parents 640f1c7 + 1ef9ace commit 8818f10

4 files changed

Lines changed: 13 additions & 19 deletions

File tree

android/build.gradle

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

3+
def safeExtGet(prop, fallback) {
4+
rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
5+
}
6+
37
android {
4-
compileSdkVersion 23
5-
buildToolsVersion '26.0.2'
8+
9+
compileSdkVersion safeExtGet('compileSdkVersion', 27)
10+
buildToolsVersion safeExtGet('buildToolsVersion', '26.0.2')
611

712
defaultConfig {
8-
minSdkVersion 16
9-
targetSdkVersion 22
13+
minSdkVersion safeExtGet('minSdkVersion', 16)
14+
targetSdkVersion safeExtGet('targetSdkVersion', 27)
1015
versionCode 1
1116
versionName "1.0"
1217
}
@@ -24,6 +29,6 @@ repositories {
2429
}
2530

2631
dependencies {
27-
compile fileTree(include: ['*.jar'], dir: 'libs')
28-
compile 'com.facebook.react:react-native:+'
32+
api fileTree(include: ['*.jar'], dir: 'libs')
33+
implementation 'com.facebook.react:react-native:+'
2934
}

android/local.properties

Lines changed: 0 additions & 11 deletions
This file was deleted.

android/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
此插件所依赖的 JCore Android SDK 版本为
22

3-
android-jcore-version: v1.2.0
3+
android-jcore-version: v1.2.6
44

55
此版本与 jcore-react-native 插件版本并不相同。如果有使用其他的 react native 插件如 jpush,jmessage,jshare,janalytics 等,需要去看看每个插件所依赖的 jcore 版本是多少。通常可以在 github release 中看到详细信息。

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jcore-react-native",
3-
"version": "1.2.12",
3+
"version": "1.3.0",
44
"description": "Common lib for jpush react-native familiy",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)