Skip to content

Commit

Permalink
Merge pull request #453 from polkawallet-io/develop
Browse files Browse the repository at this point in the history
release 3692
  • Loading branch information
RomeroYang authored Sep 24, 2024
2 parents 8d1fade + 61b3fb9 commit 6722d6d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 33
compileSdkVersion 34
ndkVersion flutter.ndkVersion

compileOptions {
Expand All @@ -52,7 +52,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.polkawallet.www.polka_wallet"
minSdkVersion 23
targetSdkVersion flutter.targetSdkVersion
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
12 changes: 6 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3681;
CURRENT_PROJECT_VERSION = 3692;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand All @@ -373,7 +373,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.6.8;
MARKETING_VERSION = 3.6.9;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -502,7 +502,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3681;
CURRENT_PROJECT_VERSION = 3692;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand All @@ -521,7 +521,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.6.8;
MARKETING_VERSION = 3.6.9;
PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -543,7 +543,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3681;
CURRENT_PROJECT_VERSION = 3692;
DEVELOPMENT_TEAM = WQ5H736A22;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = armv7;
Expand All @@ -562,7 +562,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.6.8;
MARKETING_VERSION = 3.6.9;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.polkawallet.polkawallet;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
16 changes: 8 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1019,8 +1019,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "9d8651921a3268bd1c5b40d55ab8e27eab90a6c3"
resolved-ref: "9d8651921a3268bd1c5b40d55ab8e27eab90a6c3"
ref: "7b4ed9da262d27fc624abf1e0dffa2c52e8354b2"
resolved-ref: "7b4ed9da262d27fc624abf1e0dffa2c52e8354b2"
url: "https://github.com/AcalaNetwork/polkawallet_plugin_acala.git"
source: git
version: "0.5.6"
Expand Down Expand Up @@ -1064,17 +1064,17 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "4d4400f5742cc8514392267c245d19c529a1ccba"
resolved-ref: "4d4400f5742cc8514392267c245d19c529a1ccba"
ref: "3f4397f8ad6709358500d9c874f5e0ce0304da1d"
resolved-ref: "3f4397f8ad6709358500d9c874f5e0ce0304da1d"
url: "https://github.com/AcalaNetwork/polkawallet_plugin_karura.git"
source: git
version: "0.5.6"
polkawallet_plugin_kusama:
dependency: "direct main"
description:
path: "."
ref: a247b48399cd28f57e52d589d85aa462d3af3cea
resolved-ref: a247b48399cd28f57e52d589d85aa462d3af3cea
ref: "1ef0a77d0304e8ff9f3518237214cfe130079187"
resolved-ref: "1ef0a77d0304e8ff9f3518237214cfe130079187"
url: "https://github.com/polkawallet-io/polkawallet_plugin_kusama.git"
source: git
version: "0.5.2"
Expand All @@ -1100,10 +1100,10 @@ packages:
dependency: "direct main"
description:
name: polkawallet_sdk
sha256: "5f50767dd7d897b78779d9293b87c860484d18761a595745007c27ade94ee1a3"
sha256: "594f745189ec59b4434574752d806bc9d4291ed63da5301f7d7d51267a2179ae"
url: "https://pub.dev"
source: hosted
version: "0.6.1+1"
version: "0.6.2"
polkawallet_ui:
dependency: "direct main"
description:
Expand Down
10 changes: 5 additions & 5 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 3.6.8+3681
version: 3.6.9+3692

environment:
sdk: ">=2.10.0 <3.0.0"
Expand Down Expand Up @@ -51,15 +51,15 @@ dependencies:
polkawallet_plugin_kusama:
git:
url: https://github.com/polkawallet-io/polkawallet_plugin_kusama.git
ref: a247b48399cd28f57e52d589d85aa462d3af3cea
ref: 1ef0a77d0304e8ff9f3518237214cfe130079187
polkawallet_plugin_acala:
git:
url: https://github.com/AcalaNetwork/polkawallet_plugin_acala.git
ref: 9d8651921a3268bd1c5b40d55ab8e27eab90a6c3
ref: 7b4ed9da262d27fc624abf1e0dffa2c52e8354b2
polkawallet_plugin_karura:
git:
url: https://github.com/AcalaNetwork/polkawallet_plugin_karura.git
ref: 4d4400f5742cc8514392267c245d19c529a1ccba
ref: 3f4397f8ad6709358500d9c874f5e0ce0304da1d
polkawallet_plugin_evm:
git:
url: https://github.com/polkawallet-io/polkawallet_plugin_evm.git
Expand Down Expand Up @@ -112,7 +112,7 @@ dependency_overrides:
# polkawallet_plugin_evm:
# path: ../../coding/polkawallet/polkawallet_plugin_evm
polkawallet_ui: ^0.5.6
polkawallet_sdk: ^0.6.1+1
polkawallet_sdk: ^0.6.2
# polkawallet_ui:
# path: ../../coding/polkawallet/ui
# polkawallet_sdk:
Expand Down

0 comments on commit 6722d6d

Please sign in to comment.