Skip to content

Commit

Permalink
1.3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Houn committed Dec 19, 2023
1 parent a420a41 commit 76e15c2
Show file tree
Hide file tree
Showing 19 changed files with 97 additions and 82 deletions.
1 change: 1 addition & 0 deletions particle-aa/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## 1.3.6
## 1.3.4
Sync with particle-auth
## 1.3.2
Expand Down
2 changes: 1 addition & 1 deletion particle-aa/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
def sdkVersion = "1.3.3"
def sdkVersion = "1.3.10"
implementation("network.particle:aa-service:$sdkVersion")
implementation("com.blankj:utilcodex:1.31.0")
implementation("commons-codec:commons-codec:1.15")
Expand Down
113 changes: 57 additions & 56 deletions particle-aa/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,76 +1,77 @@
name: particle_aa
description: A flutter plugin project for particle aa
version: 1.3.4
version: 1.3.6
homepage: https://particle.network

environment:
sdk: '>=3.0.0 <4.0.0'
flutter: ">=3.10.6"
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.10.6'

dependencies:
flutter:
sdk: flutter
plugin_platform_interface: ^2.1.6
flutter:
sdk: flutter
plugin_platform_interface: ^2.1.6

particle_auth: ^1.3.6

particle_auth: ^1.3.4
# particle_auth:
# path: ../particle-auth/

dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^3.0.1
flutter_test:
sdk: flutter
flutter_lints: ^3.0.1

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec

# The following section is specific to Flutter packages.
flutter:
# This section identifies this Flutter project as a plugin project.
# The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.)
# which should be registered in the plugin registry. This is required for
# using method channels.
# The Android 'package' specifies package in which the registered class is.
# This is required for using method channels on Android.
# The 'ffiPlugin' specifies that native code should be built and bundled.
# This is required for using `dart:ffi`.
# All these are used by the tooling to maintain consistency when
# adding or updating assets for this project.
plugin:
platforms:
android:
package: network.particle.aa_plugin.particle_aa
pluginClass: ParticleAAPlugin
ios:
pluginClass: ParticleAAPlugin
# This section identifies this Flutter project as a plugin project.
# The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.)
# which should be registered in the plugin registry. This is required for
# using method channels.
# The Android 'package' specifies package in which the registered class is.
# This is required for using method channels on Android.
# The 'ffiPlugin' specifies that native code should be built and bundled.
# This is required for using `dart:ffi`.
# All these are used by the tooling to maintain consistency when
# adding or updating assets for this project.
plugin:
platforms:
android:
package: network.particle.aa_plugin.particle_aa
pluginClass: ParticleAAPlugin
ios:
pluginClass: ParticleAAPlugin

# To add assets to your plugin package, add an assets section, like this:
# assets:
# - images/a_dot_burr.jpeg
# - images/a_dot_ham.jpeg
#
# For details regarding assets in packages, see
# https://flutter.dev/assets-and-images/#from-packages
#
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware
# To add assets to your plugin package, add an assets section, like this:
# assets:
# - images/a_dot_burr.jpeg
# - images/a_dot_ham.jpeg
#
# For details regarding assets in packages, see
# https://flutter.dev/assets-and-images/#from-packages
#
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware

# To add custom fonts to your plugin package, add a fonts section here,
# in this "flutter" section. Each entry in this list should have a
# "family" key with the font family name, and a "fonts" key with a
# list giving the asset and other descriptors for the font. For
# example:
# fonts:
# - family: Schyler
# fonts:
# - asset: fonts/Schyler-Regular.ttf
# - asset: fonts/Schyler-Italic.ttf
# style: italic
# - family: Trajan Pro
# fonts:
# - asset: fonts/TrajanPro.ttf
# - asset: fonts/TrajanPro_Bold.ttf
# weight: 700
#
# For details regarding fonts in packages, see
# https://flutter.dev/custom-fonts/#from-packages
# To add custom fonts to your plugin package, add a fonts section here,
# in this "flutter" section. Each entry in this list should have a
# "family" key with the font family name, and a "fonts" key with a
# list giving the asset and other descriptors for the font. For
# example:
# fonts:
# - family: Schyler
# fonts:
# - asset: fonts/Schyler-Regular.ttf
# - asset: fonts/Schyler-Italic.ttf
# style: italic
# - family: Trajan Pro
# fonts:
# - asset: fonts/TrajanPro.ttf
# - asset: fonts/TrajanPro_Bold.ttf
# weight: 700
#
# For details regarding fonts in packages, see
# https://flutter.dev/custom-fonts/#from-packages
2 changes: 2 additions & 0 deletions particle-auth-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 1.3.6
## 1.3.5
## 1.3.4
Sync with particle-auth
## 1.3.2
Expand Down
2 changes: 1 addition & 1 deletion particle-auth-core/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
def sdkVersion = "1.3.3"
def sdkVersion = "1.3.10"
implementation("network.particle:connect-common:$sdkVersion")
implementation("network.particle:base-service:$sdkVersion")
implementation("network.particle:mpc-core:$sdkVersion")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ object AuthCoreBridge {
fun connect(jwt: String, result: MethodChannel.Result) {
AuthCore.connect(jwt, object : AuthCoreServiceCallback<UserInfo> {
override fun success(output: UserInfo) {
result.success(FlutterCallBack.success(output).toGson())
try {
result.success(FlutterCallBack.success(output).toGson())
}catch (_:Exception){

}
}

override fun failure(errMsg: ErrorInfo) {
Expand Down
10 changes: 7 additions & 3 deletions particle-auth-core/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,13 @@ android {
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName

manifestPlaceholders["PN_PROJECT_ID"] = "7399450c-7c80-4fa9-b61a-58c815a821a2"
manifestPlaceholders["PN_PROJECT_CLIENT_KEY"] = "cip1DpxvzNMYekotllYMmiTVtpNClCaCEccjSkqw"
manifestPlaceholders["PN_APP_ID"] = "67673549-a6c9-44d8-a393-e9af7b0edccf"
// manifestPlaceholders["PN_PROJECT_ID"] = "7399450c-7c80-4fa9-b61a-58c815a821a2"
// manifestPlaceholders["PN_PROJECT_CLIENT_KEY"] = "cip1DpxvzNMYekotllYMmiTVtpNClCaCEccjSkqw"
// manifestPlaceholders["PN_APP_ID"] = "67673549-a6c9-44d8-a393-e9af7b0edccf"

manifestPlaceholders["PN_PROJECT_ID"] = "b0991b94-8219-4499-bf8e-d92ce6087f72"
manifestPlaceholders["PN_PROJECT_CLIENT_KEY"] = "cEpW3oDxg8JoFK2WR4OT04d0mMffdBRPiQIbu0xF"
manifestPlaceholders["PN_APP_ID"] = "91d7cefb-2ee9-4770-882d-5cd03f4cc729"

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class AuthCoreLogic {

static void connect() async {
try {
const jwt = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IndVUE05RHNycml0Sy1jVHE2OWNKcCJ9.eyJlbWFpbCI6InBhbnRhb3ZheUBnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImlzcyI6Imh0dHBzOi8vZGV2LXFyNi01OWVlLnVzLmF1dGgwLmNvbS8iLCJhdWQiOiJFVmpLMVpaUFN0UWNkV3VoandQZGRBdGdSaXdwNTRWUSIsImlhdCI6MTcwMDAxNjYzMSwiZXhwIjoxNzAwMDUyNjMxLCJzdWIiOiJhdXRoMHw2MzAzMjE0YjZmNjE1NjM2YWM5MTdmMWIiLCJzaWQiOiIybWRCWmJBT3Z2WEhyYlRoQUV4dnh5bmJSWnpoOEZlTyJ9.a_tSi4mjcgMR6VmoNFKTKqhzVKigX1XNz7lGJnPj6PoucfgMCc6MdqOfg4hmMprXvuoqe8PLWLeC1t_QOa2FA4KOdc9ast24byu3-0sy1_VI0Vp8nfsGwLPqRNr3x3bvW2tvh_ACntC_pmahg1EB6_k2rwj5ujjdBe3PnphExq7mXfUy0xc_Ovs0LW6LLxvIfL1ye4Ny23miib2rD713sTT9AH7Y7ZKN5_AX91yxVlDz5KIXpEOtbA5IS7JcD1THbHu_O3KtSzd4fklBRD8HH08VzJFyqtNMds5KKerQ4ixB3UlDZyjQQAU21Bo7LBLyPijbumVIqv-1zzplqOpP7w"; // paste your jwt
const jwt = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IndVUE05RHNycml0Sy1jVHE2OWNKcCJ9.eyJlbWFpbCI6InBhbnRhb3ZheUBnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImlzcyI6Imh0dHBzOi8vZGV2LXFyNi01OWVlLnVzLmF1dGgwLmNvbS8iLCJhdWQiOiJFVmpLMVpaUFN0UWNkV3VoandQZGRBdGdSaXdwNTRWUSIsImlhdCI6MTcwMjYyMTQ0NCwiZXhwIjoxNzAyNjU3NDQ0LCJzdWIiOiJhdXRoMHw2MzAzMjE0YjZmNjE1NjM2YWM5MTdmMWIiLCJzaWQiOiJTZnlfVElJeVVDUFJMcmlrd0sxZDRnMXVkN1ROaWRlUSJ9.HUE08zLrlIcNVW2y8m_8QBv2fW9nixnujoBesjWkVdxiXjCzmmdqUMsPWip6vevPFgEri2-O6MAIJQwSIvfXinv3kLiBCtToqtnaF_BgROo3w6hUhHU6kW6WIP9qww3BnvVNgPbmHzgjGKJmhPNYet6_i7UMrlbyx6ZRNrDg7UiPbkmpWGqqIj8506dCcScbD2PF3dUPfweI1L7J6yQfCBB_aPsrtGGll2J4K97FzNLFjabT--lG0xDDvYiFpkjv0agdV7kkX9IQsp53BfQF1FA2o6hUanLlwCR0v-ON6RYMn-Cj92LGhp8-ng6wwuGcx_JJ0ocgY6rbrKwWZa-gPw"; // paste your jwt
final userInfo = await ParticleAuthCore.connect(jwt);
print("connect: $userInfo");
showToast("connect: $userInfo");
Expand Down
4 changes: 2 additions & 2 deletions particle-auth-core/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: particle_auth_core
description: A flutter plugin project for particle auth core
version: 1.3.4
version: 1.3.6
homepage: https://particle.network

environment:
Expand All @@ -11,7 +11,7 @@ dependencies:
flutter:
sdk: flutter
plugin_platform_interface: ^2.1.6
particle_auth: ^1.3.4
particle_auth: ^1.3.6
# particle_auth:
# path: ../particle-auth/

Expand Down
1 change: 1 addition & 0 deletions particle-auth/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## 1.3.6
## 1.3.4
Fix typo bugs
## 1.3.2
Expand Down
4 changes: 2 additions & 2 deletions particle-auth/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
def sdkVersion = "1.3.3"
def sdkVersion = "1.3.10"
implementation("network.particle:auth-service:$sdkVersion")
implementation("com.blankj:utilcodex:1.31.0")
implementation("commons-codec:commons-codec:1.15")
implementation("com.google.code.gson:gson:2.8.5")
}
}
2 changes: 1 addition & 1 deletion particle-auth/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: particle_auth
description: A flutter plugin project for particle auth
version: 1.3.4
version: 1.3.6
homepage: https://particle.network

environment:
Expand Down
1 change: 1 addition & 0 deletions particle-connect/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## 1.3.6
## 1.3.4
Sync with particle-auth
## 1.3.3
Expand Down
6 changes: 3 additions & 3 deletions particle-connect/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -255,17 +255,17 @@ packages:
dependency: transitive
description:
name: particle_auth
sha256: fbe6cd62d67ed80ecedbfec8316d78a8910c2d987793a124937220a4925eb033
sha256: "7fabe4b3a01c0cdf3899e1ea2229aaa0418ddaed664a5508ac0baed5901bf5d8"
url: "https://pub.dev"
source: hosted
version: "1.3.4"
version: "1.3.6"
particle_connect:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "1.3.4"
version: "1.3.6"
path:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions particle-connect/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: particle_connect
description: A flutter plugin project for particle connect
version: 1.3.4
version: 1.3.6
homepage: https://particle.network/

environment:
Expand All @@ -11,7 +11,7 @@ dependencies:
flutter:
sdk: flutter
plugin_platform_interface: ^2.1.6
particle_auth: ^1.3.4
particle_auth: ^1.3.6
# particle_auth:
# path: ../particle-auth/

Expand Down
1 change: 1 addition & 0 deletions particle-wallet/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## 1.3.6
## 1.3.4
Sync with particle-auth
## 1.3.2
Expand Down
2 changes: 1 addition & 1 deletion particle-wallet/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ android {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
def sdkVersion = "1.3.3"
def sdkVersion = "1.3.10"
implementation("network.particle:auth-service:$sdkVersion")
implementation("network.particle:api-service:$sdkVersion")
implementation("network.particle:wallet-service:$sdkVersion"){
Expand Down
10 changes: 5 additions & 5 deletions particle-wallet/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -255,25 +255,25 @@ packages:
dependency: transitive
description:
name: particle_auth
sha256: "0b4dd603eac797b87cc80510d34b67fc057b75f51135c2fe268c0df83dac5969"
sha256: "7fabe4b3a01c0cdf3899e1ea2229aaa0418ddaed664a5508ac0baed5901bf5d8"
url: "https://pub.dev"
source: hosted
version: "1.3.2"
version: "1.3.6"
particle_connect:
dependency: transitive
description:
name: particle_connect
sha256: "9c3183f74b1107593721e7e56480d16253ae4b652aa0683e6f98ce8fd0aa1d90"
sha256: f50fcdbb6d1a4b7127b06ebc3630c6f4aadc21414be6cda8601c147393c74ffb
url: "https://pub.dev"
source: hosted
version: "1.3.2"
version: "1.3.6"
particle_wallet:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "1.3.4"
version: "1.3.6"
path:
dependency: transitive
description:
Expand Down
6 changes: 3 additions & 3 deletions particle-wallet/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: particle_wallet
description: A flutter plugin project for particle wallet
version: 1.3.4
version: 1.3.6
homepage: https://particle.network

environment:
Expand All @@ -10,8 +10,8 @@ environment:
dependencies:
flutter:
sdk: flutter
particle_connect: ^1.3.2
particle_auth: ^1.3.2
particle_connect: ^1.3.6
particle_auth: ^1.3.6

# particle_connect:
# path: ../particle-connect/
Expand Down

0 comments on commit 76e15c2

Please sign in to comment.