Skip to content

Commit

Permalink
Merge pull request #68 from mymonero/develop
Browse files Browse the repository at this point in the history
Merge 1.3.2 into master
  • Loading branch information
devinpearson authored Aug 25, 2022
2 parents f20df2e + cc9a67b commit b001c1c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "com.mymonero.official_android_application"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 24
versionName "1.3.0"
versionCode 26
versionName "1.3.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
8 changes: 4 additions & 4 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -357,13 +357,13 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 55;
CURRENT_PROJECT_VERSION = 57;
DEVELOPMENT_TEAM = NLN5D623Y3;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.2;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = "com.mymonero.mymonero-app";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -382,13 +382,13 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 55;
CURRENT_PROJECT_VERSION = 57;
DEVELOPMENT_TEAM = NLN5D623Y3;
INFOPLIST_FILE = App/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = "com.mymonero.mymonero-app";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "MyMonero",
"author": "MyMonero",
"description": "The simplest way to use Monero",
"version": "1.3.0",
"version": "1.3.2",
"license": "SEE LICENSE IN LICENSE.txt",
"repository": "https://github.com/mymonero/mymonero-mobile",
"scripts": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"@ionic/pwa-elements": "^3.0.2",
"@johnbraum/capacitor-qrscanner": "^1.1.11",
"@mymonero/capacitor-file-picker": "^2.1.5",
"@mymonero/mymonero-app-bridge": "^2.1.14",
"@mymonero/mymonero-app-bridge": "^2.1.18",
"@mymonero/mymonero-bigint": "^1.1.15",
"@mymonero/mymonero-bridge-utils": "^1.1.15",
"@mymonero/mymonero-exchange": "^1.1.17",
Expand Down

0 comments on commit b001c1c

Please sign in to comment.