diff --git a/.packages b/.packages index 3ac23c1..852e85b 100644 --- a/.packages +++ b/.packages @@ -1,55 +1,56 @@ -# Generated by pub on 2018-12-28 11:16:51.907295. -analyzer:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.33.0/lib/ -args:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.0/lib/ -async:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib/ -boolean_selector:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib/ -charcode:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib/ -collection:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib/ -convert:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.0.2/lib/ -crypto:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.6/lib/ -csslib:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.6/lib/ -front_end:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.6/lib/ -glob:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/glob-1.1.7/lib/ -html:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+3/lib/ -http:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0/lib/ -http_multi_server:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib/ -http_parser:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/ -io:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/io-0.3.3/lib/ -js:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib/ -json_rpc_2:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.9/lib/ -kernel:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.6/lib/ -logging:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib/ -matcher:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib/ -meta:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib/ -mime:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+2/lib/ -mockito:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/mockito-3.0.0/lib/ -multi_server_socket:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.2/lib/ -node_preamble:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.4/lib/ -package_config:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.5/lib/ -package_resolver:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.6/lib/ -path:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib/ -platform:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/platform-2.2.0/lib/ -plugin:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+3/lib/ -pool:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/pool-1.3.6/lib/ -pub_semver:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.2/lib/ -shelf:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+3/lib/ -shelf_packages_handler:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.4/lib/ -shelf_static:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.8/lib/ -shelf_web_socket:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+4/lib/ -sky_engine:file:///Applications/flutter/bin/cache/pkg/sky_engine/lib/ -source_map_stack_trace:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.5/lib/ -source_maps:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.8/lib/ -source_span:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib/ -stack_trace:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib/ -stream_channel:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib/ -string_scanner:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib/ -term_glyph:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.1/lib/ -test:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/test-1.3.4/lib/ -typed_data:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib/ -utf:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+5/lib/ -vector_math:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib/ -vm_service_client:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.6/lib/ -watcher:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+10/lib/ -web_socket_channel:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib/ -yaml:file:///Applications/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.15/lib/ +# Generated by pub on 2019-07-24 14:38:49.565093. +analyzer:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/analyzer-0.37.0/lib/ +args:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/args-1.5.2/lib/ +async:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/async-2.3.0/lib/ +boolean_selector:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-1.0.5/lib/ +charcode:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.2/lib/ +collection:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.11/lib/ +convert:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1/lib/ +crypto:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.0.6/lib/ +csslib:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/csslib-0.16.1/lib/ +flutter:file:///Users/shikk/Documents/flutter/packages/flutter/lib/ +front_end:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/front_end-0.1.20/lib/ +glob:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/glob-1.1.7/lib/ +html:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/html-0.14.0+2/lib/ +http:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.0+2/lib/ +http_multi_server:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/http_multi_server-2.1.0/lib/ +http_parser:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.3/lib/ +io:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/io-0.3.3/lib/ +js:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/js-0.6.1+1/lib/ +kernel:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/kernel-0.3.20/lib/ +matcher:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.5/lib/ +meta:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.6/lib/ +mime:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/mime-0.9.6+3/lib/ +mockito:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/mockito-3.0.2/lib/ +multi_server_socket:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/multi_server_socket-1.0.2/lib/ +node_preamble:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/node_preamble-1.4.5/lib/ +package_config:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/package_config-1.0.5/lib/ +package_resolver:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/package_resolver-1.0.10/lib/ +path:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.2/lib/ +pedantic:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.8.0+1/lib/ +platform:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.0/lib/ +pool:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/pool-1.4.0/lib/ +pub_semver:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/pub_semver-1.4.2/lib/ +shelf:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/shelf-0.7.5/lib/ +shelf_packages_handler:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/shelf_packages_handler-1.0.4/lib/ +shelf_static:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/shelf_static-0.2.8/lib/ +shelf_web_socket:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/shelf_web_socket-0.2.3/lib/ +sky_engine:file:///Users/shikk/Documents/flutter/bin/cache/pkg/sky_engine/lib/ +source_map_stack_trace:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/source_map_stack_trace-1.1.5/lib/ +source_maps:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/source_maps-0.10.8/lib/ +source_span:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5/lib/ +stack_trace:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3/lib/ +stream_channel:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0/lib/ +stream_transform:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/stream_transform-0.0.19/lib/ +string_scanner:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.4/lib/ +term_glyph:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0/lib/ +test:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/test-1.6.5/lib/ +test_api:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.6/lib/ +test_core:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/test_core-0.2.7/lib/ +typed_data:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6/lib/ +vector_math:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8/lib/ +vm_service_lib:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/vm_service_lib-3.22.2/lib/ +watcher:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/watcher-0.9.7+12/lib/ +web_socket_channel:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/web_socket_channel-1.0.14/lib/ +yaml:file:///Users/shikk/.pub-cache/hosted/pub.flutter-io.cn/yaml-2.1.16/lib/ jpush_flutter:lib/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 13e2f8e..99b5509 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.0.13 + +featurn: +适配flutter 1.7.8 +升级 jpush sdk 版本为3.3.4 + ## 0.0.12 featurn: 修改LocalNotification的属性名为"extra" diff --git a/README.md b/README.md index c7e786e..a3319c2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ```yaml dependencies: - jpush_flutter: 0.0.12 + jpush_flutter: 0.0.13 ``` ### 配置 diff --git a/android/build.gradle b/android/build.gradle index f178066..da62ed2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,6 +34,9 @@ android { } dependencies { - implementation 'cn.jiguang.sdk:jpush:3.1.6' // 此处以JPush 3.1.6 版本为例。 - implementation 'cn.jiguang.sdk:jcore:1.2.5' // 此处以JCore 1.2.5 版本为例。 + implementation 'cn.jiguang.sdk:jpush:3.3.4' + implementation 'cn.jiguang.sdk:jcore:2.1.2' + implementation 'com.android.support:appcompat-v7:27.+' + compileOnly files('libs/flutter.jar') + } \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 105a85c..ea402fd 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 18 15:12:00 CST 2018 +#Fri Jul 26 11:14:36 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/android/libs/flutter.jar b/android/libs/flutter.jar new file mode 100644 index 0000000..0bab4be Binary files /dev/null and b/android/libs/flutter.jar differ diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 54a13ee..be92956 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -22,5 +22,16 @@ + + + + + + + + diff --git a/android/src/main/java/com/jiguang/jpush/JPushCustomService.java b/android/src/main/java/com/jiguang/jpush/JPushCustomService.java new file mode 100644 index 0000000..2fe9d19 --- /dev/null +++ b/android/src/main/java/com/jiguang/jpush/JPushCustomService.java @@ -0,0 +1,6 @@ +package com.jiguang.jpush; + +import cn.jpush.android.service.JCommonService; + +public class JPushCustomService extends JCommonService { +} diff --git a/android/src/main/java/com/jiguang/jpush/JPushEventReceiver.java b/android/src/main/java/com/jiguang/jpush/JPushEventReceiver.java index fd74ea4..5bdbe3d 100644 --- a/android/src/main/java/com/jiguang/jpush/JPushEventReceiver.java +++ b/android/src/main/java/com/jiguang/jpush/JPushEventReceiver.java @@ -1,6 +1,8 @@ package com.jiguang.jpush; import android.content.Context; +import android.os.Handler; +import android.os.Looper; import android.util.Log; import org.json.JSONException; @@ -19,97 +21,113 @@ import io.flutter.plugin.common.MethodChannel.Result; public class JPushEventReceiver extends JPushMessageReceiver { @Override - public void onTagOperatorResult(Context context, JPushMessage jPushMessage) { + public void onTagOperatorResult(Context context, final JPushMessage jPushMessage) { super.onTagOperatorResult(context, jPushMessage); - JSONObject resultJson = new JSONObject(); + final JSONObject resultJson = new JSONObject(); - int sequence = jPushMessage.getSequence(); + final int sequence = jPushMessage.getSequence(); try { resultJson.put("sequence", sequence); } catch (JSONException e) { e.printStackTrace(); } - Result callback = JPushPlugin.instance.callbackMap.get(sequence);//instance.eventCallbackMap.get(sequence); + final Result callback = JPushPlugin.instance.callbackMap.get(sequence);//instance.eventCallbackMap.get(sequence); if (callback == null) { Log.i("JPushPlugin", "Unexpected error, callback is null!"); return; } - if (jPushMessage.getErrorCode() == 0) { // success - Set tags = jPushMessage.getTags(); - List tagList = new ArrayList<>(tags); - Map res = new HashMap<>(); - res.put("tags", tagList); - callback.success(res); - } else { - try { - resultJson.put("code", jPushMessage.getErrorCode()); - } catch (JSONException e) { - e.printStackTrace(); + new Handler(Looper.getMainLooper()).post(new Runnable() { + @Override + public void run() { + if (jPushMessage.getErrorCode() == 0) { // success + Set tags = jPushMessage.getTags(); + List tagList = new ArrayList<>(tags); + Map res = new HashMap<>(); + res.put("tags", tagList); + callback.success(res); + } else { + try { + resultJson.put("code", jPushMessage.getErrorCode()); + } catch (JSONException e) { + e.printStackTrace(); + } + callback.error(Integer.toString(jPushMessage.getErrorCode()), "", ""); + } + + JPushPlugin.instance.callbackMap.remove(sequence); } - callback.error(Integer.toString(jPushMessage.getErrorCode()), "", ""); - } + }); - JPushPlugin.instance.callbackMap.remove(sequence); } @Override - public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage) { + public void onCheckTagOperatorResult(Context context, final JPushMessage jPushMessage) { super.onCheckTagOperatorResult(context, jPushMessage); - int sequence = jPushMessage.getSequence(); + final int sequence = jPushMessage.getSequence(); - Result callback = JPushPlugin.instance.callbackMap.get(sequence); + final Result callback = JPushPlugin.instance.callbackMap.get(sequence); if (callback == null) { Log.i("JPushPlugin", "Unexpected error, callback is null!"); return; } - if (jPushMessage.getErrorCode() == 0) { - Set tags = jPushMessage.getTags(); - List tagList = new ArrayList<>(tags); - Map res = new HashMap<>(); - res.put("tags", tagList); - callback.success(res); - } else { - - callback.error(Integer.toString(jPushMessage.getErrorCode()), "", ""); - } - - JPushPlugin.instance.callbackMap.remove(sequence); + new Handler(Looper.getMainLooper()).post(new Runnable() { + @Override + public void run() { + if (jPushMessage.getErrorCode() == 0) { + Set tags = jPushMessage.getTags(); + List tagList = new ArrayList<>(tags); + Map res = new HashMap<>(); + res.put("tags", tagList); + callback.success(res); + } else { + + callback.error(Integer.toString(jPushMessage.getErrorCode()), "", ""); + } + + JPushPlugin.instance.callbackMap.remove(sequence); + } + }); } @Override - public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) { + public void onAliasOperatorResult(Context context, final JPushMessage jPushMessage) { super.onAliasOperatorResult(context, jPushMessage); - int sequence = jPushMessage.getSequence(); + final int sequence = jPushMessage.getSequence(); - Result callback = JPushPlugin.instance.callbackMap.get(sequence); + final Result callback = JPushPlugin.instance.callbackMap.get(sequence); if (callback == null) { Log.i("JPushPlugin", "Unexpected error, callback is null!"); return; } - if (jPushMessage.getErrorCode() == 0) { // success - Map res = new HashMap<>(); - res.put("alias", (jPushMessage.getAlias() == null)? "" : jPushMessage.getAlias()); - callback.success(res); + new Handler(Looper.getMainLooper()).post(new Runnable() { + @Override + public void run() { + if (jPushMessage.getErrorCode() == 0) { // success + Map res = new HashMap<>(); + res.put("alias", (jPushMessage.getAlias() == null)? "" : jPushMessage.getAlias()); + callback.success(res); - } else { - callback.error(Integer.toString(jPushMessage.getErrorCode()), "", ""); - } + } else { + callback.error(Integer.toString(jPushMessage.getErrorCode()), "", ""); + } - JPushPlugin.instance.callbackMap.remove(sequence); + JPushPlugin.instance.callbackMap.remove(sequence); + } + }); } } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 2bf41b3..e502926 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -34,7 +34,7 @@ android { // applicationId "com.jiguang.jpushexample" - applicationId "com.example.huminios.jpushtest" //JPush 上注册的包名. + applicationId "com.shikk.testJpush" //JPush 上注册的包名. minSdkVersion 16 targetSdkVersion 27 @@ -46,13 +46,13 @@ android { ndk { //选择要添加的对应 cpu 类型的 .so 库。 - abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64'// 'arm64-v8a', + abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'x86_64', 'mips', 'mips64', 'arm64-v8a' // 还可以添加 } manifestPlaceholders = [ JPUSH_PKGNAME : applicationId, - JPUSH_APPKEY : "a1703c14b186a68a66ef86c1", //JPush 上注册的包名对应的 Appkey. + JPUSH_APPKEY : "31c7c1b2cf59c1d42895a782", //JPush 上注册的包名对应的 Appkey. JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可. ] } diff --git a/example/lib/main.dart b/example/lib/main.dart index 0a7ed6b..d24001a 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -107,7 +107,7 @@ final JPush jpush = new JPush(); fireTime: fireDate, subtitle: 'fasf', badge: 5, - extras: {"fa": "0"} + extra: {"fa": "0"} ); jpush.sendLocalNotification(localNotification).then((res) { setState(() { diff --git a/example/pubspec.lock b/example/pubspec.lock index c3fe1c0..0dec253 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -1,74 +1,74 @@ # Generated by pub -# See https://www.dartlang.org/tools/pub/glossary#lockfile +# See https://dart.dev/tools/pub/glossary#lockfile packages: analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.32.4" + version: "0.36.4" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.5.0" + version: "1.5.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.8" + version: "2.2.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.14.11" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.2" + version: "2.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.6" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.14.5" + version: "0.16.1" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.1.2" flutter: @@ -85,49 +85,49 @@ packages: dependency: transitive description: name: front_end - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.4" + version: "0.1.19" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.7" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.13.3+3" + version: "0.14.0+2" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.11.3+17" + version: "0.12.0+2" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.5" + version: "2.1.0" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.3" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.3" jpush_flutter: @@ -136,161 +136,154 @@ packages: path: ".." relative: true source: path - version: "0.0.11" + version: "0.0.12" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.1+1" json_rpc_2: dependency: transitive description: name: json_rpc_2 - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.9" + version: "2.1.0" kernel: dependency: transitive description: name: kernel - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.4" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.11.3+2" + version: "0.3.19" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.3+1" + version: "0.12.5" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.6" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.6+2" + version: "0.9.6+3" mockito: dependency: "direct dev" description: name: mockito - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.0" + version: "3.0.2" multi_server_socket: dependency: transitive description: name: multi_server_socket - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" node_preamble: dependency: transitive description: name: node_preamble - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.4" + version: "1.4.5" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" package_resolver: dependency: transitive description: name: package_resolver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.4" + version: "1.0.10" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.6.2" - platform: + pedantic: dependency: transitive description: - name: platform - url: "https://pub.dartlang.org" + name: pedantic + url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.0" - plugin: + version: "1.7.0" + platform: dependency: transitive description: - name: plugin - url: "https://pub.dartlang.org" + name: platform + url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.0+3" + version: "2.2.0" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.6" + version: "1.4.0" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.2" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.0+1" + version: "2.0.3" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.7.3+3" + version: "0.7.5" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" shelf_static: dependency: transitive description: name: shelf_static - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.8" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.2+4" + version: "0.2.3" sky_engine: dependency: transitive description: flutter @@ -300,106 +293,113 @@ packages: dependency: transitive description: name: source_map_stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.5" source_maps: dependency: transitive description: name: source_maps - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.10.7" + version: "0.10.8" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.1" + version: "1.5.5" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.8" + version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.1" + version: "1.1.0" test: dependency: "direct dev" description: name: test - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0" - typed_data: + version: "1.6.3" + test_api: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org" + name: test_api + url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.6" - utf: + version: "0.2.5" + test_core: + dependency: transitive + description: + name: test_core + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.2.5" + typed_data: dependency: transitive description: - name: utf - url: "https://pub.dartlang.org" + name: typed_data + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.0+5" + version: "1.1.6" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.8" vm_service_client: dependency: transitive description: name: vm_service_client - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.6" + version: "0.2.6+2" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.7+10" + version: "0.9.7+12" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.9" + version: "1.0.14" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.15" + version: "2.1.16" sdks: - dart: ">=2.0.0-dev.68.0 <3.0.0" + dart: ">=2.2.2 <3.0.0" diff --git a/pubspec.lock b/pubspec.lock index 6a2acb1..b0d29c4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,65 +5,65 @@ packages: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.33.0" + version: "0.37.0" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.5.0" + version: "1.5.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.8" + version: "2.3.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.4" + version: "1.0.5" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.2" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.14.11" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.2" + version: "2.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.6" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.14.6" + version: "0.16.1" flutter: dependency: "direct main" description: flutter @@ -73,198 +73,184 @@ packages: dependency: transitive description: name: front_end - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.6" + version: "0.1.20" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.7" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.13.3+3" + version: "0.14.0+2" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.0" + version: "0.12.0+2" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.5" + version: "2.1.0" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "3.1.3" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.3.3" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.1+1" - json_rpc_2: - dependency: transitive - description: - name: json_rpc_2 - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.9" kernel: dependency: transitive description: name: kernel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.6" - logging: - dependency: transitive - description: - name: logging - url: "https://pub.dartlang.org" - source: hosted - version: "0.11.3+2" + version: "0.3.20" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.3+1" + version: "0.12.5" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.6" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.6+2" + version: "0.9.6+3" mockito: dependency: "direct dev" description: name: mockito - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.0" + version: "3.0.2" multi_server_socket: dependency: transitive description: name: multi_server_socket - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.2" node_preamble: dependency: transitive description: name: node_preamble - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.4" + version: "1.4.5" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.5" package_resolver: dependency: transitive description: name: package_resolver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.6" + version: "1.0.10" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.6.2" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.8.0+1" platform: dependency: "direct main" description: name: platform - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.2.0" - plugin: - dependency: transitive - description: - name: plugin - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0+3" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.6" + version: "1.4.0" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.4.2" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.7.3+3" + version: "0.7.5" shelf_packages_handler: dependency: transitive description: name: shelf_packages_handler - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" shelf_static: dependency: transitive description: name: shelf_static - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.2.8" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.2+4" + version: "0.2.3" sky_engine: dependency: transitive description: flutter @@ -274,106 +260,120 @@ packages: dependency: transitive description: name: source_map_stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.5" source_maps: dependency: transitive description: name: source_maps - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "0.10.8" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.1" + version: "1.5.5" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.3" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.8" + version: "2.0.0" + stream_transform: + dependency: transitive + description: + name: stream_transform + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.0.19" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.1" + version: "1.1.0" test: dependency: "direct dev" description: name: test - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.4" - typed_data: + version: "1.6.5" + test_api: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org" + name: test_api + url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.6" - utf: + version: "0.2.6" + test_core: dependency: transitive description: - name: utf - url: "https://pub.dartlang.org" + name: test_core + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.0+5" + version: "0.2.7" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.1.6" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.8" - vm_service_client: + vm_service_lib: dependency: transitive description: - name: vm_service_client - url: "https://pub.dartlang.org" + name: vm_service_lib + url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.6" + version: "3.22.2" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.7+10" + version: "0.9.7+12" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.9" + version: "1.0.14" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.15" + version: "2.1.16" sdks: - dart: ">=2.0.0 <3.0.0" + dart: ">=2.2.2 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 8400e7f..4984d26 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: jpush_flutter description: Offically supported JPush Flutter plugin. -version: 0.0.12 +version: 0.0.13 author: huminios homepage: https://www.jiguang.cn