From f8a9ff08b1ba99d26356cc728fd589adf369b161 Mon Sep 17 00:00:00 2001 From: "qingqing.wang" Date: Wed, 16 Sep 2020 11:05:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=80=82=E9=85=8DJPush=20Android=203.8.0?= =?UTF-8?q?=20,=20IOS=203.3.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yaml | 24 ++++++++++++++++++++++++ CHANGELOG.md | 2 ++ README.md | 2 +- android/build.gradle | 2 +- pubspec.yaml | 2 +- 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/publish.yaml diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml new file mode 100644 index 0000000..d367f64 --- /dev/null +++ b/.github/workflows/publish.yaml @@ -0,0 +1,24 @@ +name: publish + +on: + push: + tags: + - v* + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Publish + uses: sakebook/actions-flutter-pub-publisher@v1.3.0 + with: + credential: ${{ secrets.CREDENTIAL_JSON }} + flutter_package: false + skip_test: true + dry_run: true + + diff --git a/CHANGELOG.md b/CHANGELOG.md index d815213..3b96f5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 0.5.7 ++ 适配最新版本 JPush SDK Android 3.8.0 , IOS 3.3.6 ## 0.5.6 + 修复：iOS点击本地通知的通知栏消息缺少extras 字段 ## 0.5.5 diff --git a/README.md b/README.md index c7cbd42..b4f35eb 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ dependencies: // pub 集成 dependencies: - jpush_flutter: 0.5.6 + jpush_flutter: 0.5.7 ``` ### 配置 diff --git a/android/build.gradle b/android/build.gradle index fa26dfb..df05d9a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,7 +34,7 @@ android { } dependencies { - implementation 'cn.jiguang.sdk:jpush:3.6.0' + implementation 'cn.jiguang.sdk:jpush:3.8.0' implementation 'cn.jiguang.sdk:jcore:2.3.4' // implementation 'com.android.support:appcompat-v7:28.+' compileOnly files('libs/flutter.jar') diff --git a/pubspec.yaml b/pubspec.yaml index 1e6dbdc..f7de2a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: jpush_flutter description: JIGUANG officially supported JPush Flutter plugin (Android & iOS). 极光推送官方支持的 Flutter 插件（Android & iOS）(https://www.jiguang.cn). -version: 0.5.6 +version: 0.5.7 author: xudong.rao homepage: https://www.jiguang.cn From 855635c5b4505eb0809826f2d3c5e2ef666c524e Mon Sep 17 00:00:00 2001 From: "qingqing.wang" Date: Wed, 16 Sep 2020 11:21:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0github=20workflows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d367f64..d93aaa6 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -19,6 +19,6 @@ jobs: credential: ${{ secrets.CREDENTIAL_JSON }} flutter_package: false skip_test: true - dry_run: true + dry_run: false From ca1c82718bb614a1c34e9b277cede36e19300813 Mon Sep 17 00:00:00 2001 From: "qingqing.wang" Date: Wed, 16 Sep 2020 11:41:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0github=20workflows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yaml | 2 +- example/lib/main.dart | 3 ++- pubspec.yaml | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index d93aaa6..b0d0502 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -16,7 +16,7 @@ jobs: - name: Publish uses: sakebook/actions-flutter-pub-publisher@v1.3.0 with: - credential: ${{ secrets.CREDENTIAL_JSON }} + credential: ${{ secrets.CREDENTIAL_JSON_JPUSH }} flutter_package: false skip_test: true dry_run: false diff --git a/example/lib/main.dart b/example/lib/main.dart index 8705650..cc67625 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -14,6 +14,7 @@ class MyApp extends StatefulWidget { class _MyAppState extends State { String debugLable = 'Unknown'; final JPush jpush = new JPush(); + @override void initState() { super.initState(); @@ -92,7 +93,7 @@ class _MyAppState extends State { Container( margin: EdgeInsets.fromLTRB(10, 10, 10, 10), color: Colors.brown, - child: Text(debugLable), + child: Text(debugLable ?? "Unknown"), width: 350, height: 100, ), diff --git a/pubspec.yaml b/pubspec.yaml index f7de2a6..83d1196 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,6 +6,7 @@ homepage: https://www.jiguang.cn environment: sdk: ">=2.0.0-dev.68.0 <3.0.0" + flutter: ">=1.10.0" dependencies: platform: ^2.0.0 @@ -21,8 +22,11 @@ dev_dependencies: # The following section is specific to Flutter. flutter: plugin: - androidPackage: com.jiguang.jpush - pluginClass: JPushPlugin + android: + package: com.jiguang.jverify + pluginClass: JPushPlugin + ios: + pluginClass: JPushPlugin # To add assets to your plugin package, add an assets section, like this: # assets: From 1725a0b9aea7d3fb26c0eeb6b9750f882281fc92 Mon Sep 17 00:00:00 2001 From: "qingqing.wang" Date: Wed, 16 Sep 2020 11:51:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0github=20workflows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 83d1196..cbfc4b9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: jpush_flutter description: JIGUANG officially supported JPush Flutter plugin (Android & iOS). 极光推送官方支持的 Flutter 插件（Android & iOS）(https://www.jiguang.cn). version: 0.5.7 -author: xudong.rao +# author: xudong.rao homepage: https://www.jiguang.cn environment: - sdk: ">=2.0.0-dev.68.0 <3.0.0" + sdk: ">=2.1.0 <3.0.0" flutter: ">=1.10.0" dependencies: From 9255bd922d148914fc8e0c656d24a23c3b54883f Mon Sep 17 00:00:00 2001 From: "qingqing.wang" Date: Wed, 16 Sep 2020 11:57:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0github=20workflows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index ba75c69..93db799 100644 --- a/LICENSE +++ b/LICENSE @@ -1 +1,21 @@ -TODO: Add your license here. +MIT License + +Copyright (c) 2020 极光开发者 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file From 0f373553105c8f661db2f504e6d865a9a56995f7 Mon Sep 17 00:00:00 2001 From: "qingqing.wang" Date: Wed, 16 Sep 2020 12:43:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=80=82=E9=85=8DJPush=20Android=203.8.0?= =?UTF-8?q?=20,=20IOS=203.3.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- README.md | 2 +- pubspec.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b96f5b..d248ab9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.5.7 +## 0.5.8 + 适配最新版本 JPush SDK Android 3.8.0 , IOS 3.3.6 ## 0.5.6 + 修复：iOS点击本地通知的通知栏消息缺少extras 字段 diff --git a/README.md b/README.md index b4f35eb..7a673ab 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ dependencies: // pub 集成 dependencies: - jpush_flutter: 0.5.7 + jpush_flutter: 0.5.8 ``` ### 配置 diff --git a/pubspec.yaml b/pubspec.yaml index cbfc4b9..0f9fff4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: jpush_flutter description: JIGUANG officially supported JPush Flutter plugin (Android & iOS). 极光推送官方支持的 Flutter 插件（Android & iOS）(https://www.jiguang.cn). -version: 0.5.7 +version: 0.5.8 # author: xudong.rao homepage: https://www.jiguang.cn @@ -23,7 +23,7 @@ dev_dependencies: flutter: plugin: android: - package: com.jiguang.jverify + package: com.jiguang.jpush pluginClass: JPushPlugin ios: pluginClass: JPushPlugin