From 43a609f194898b885c9420abdd01b297b37c98a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Mathieu?= Date: Mon, 4 Jun 2018 19:55:28 -0400 Subject: [PATCH] chore(version): updated to 0.6.0 --- CHANGELOG.md | 15 +++++++++++++++ android/Gemfile.lock | 10 +++++----- android/app/build.gradle | 4 ++-- android/fastlane/Fastfile | 13 ++++++++++++- android/fastlane/README.md | 5 +++++ android/gradle.properties | 1 + ios/Gemfile.lock | 10 +++++----- ios/Monica-tvOS/Info.plist | 4 ++-- ios/Monica-tvOSTests/Info.plist | 4 ++-- ios/Monica.xcodeproj/project.pbxproj | 4 ++-- ios/Monica/Info.plist | 4 ++-- ios/MonicaTests/Info.plist | 4 ++-- package.json | 2 +- 13 files changed, 56 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 959c9c24..254a2483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ + +# [0.6.0](https://github.com/monicahq/chandler/compare/0.5.1...0.6.0) (2018-06-04) + + +### Bug Fixes + +* validation of a local network url ([#271](https://github.com/monicahq/chandler/issues/271)) ([bf4280a](https://github.com/monicahq/chandler/commit/bf4280a)) + +### Features + +* add the ability to add notes ([#265](https://github.com/monicahq/chandler/issues/265)) ([49f68e3](https://github.com/monicahq/chandler/commit/49f68e3)) +* add the ability to edit a note ([#252](https://github.com/monicahq/chandler/issues/252)) ([2f5126f](https://github.com/monicahq/chandler/commit/2f5126f)) + + + ## [0.5.1](https://github.com/monicahq/chandler/compare/0.5.0...0.5.1) (2018-05-30) diff --git a/android/Gemfile.lock b/android/Gemfile.lock index 46c561c9..2e7ac28c 100644 --- a/android/Gemfile.lock +++ b/android/Gemfile.lock @@ -18,7 +18,7 @@ GEM dotenv (2.4.0) emoji_regex (0.1.1) excon (0.62.0) - faraday (0.15.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -26,7 +26,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.3) - fastlane (2.96.1) + fastlane (2.97.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -50,7 +50,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.1.0, < 2.0.0) + rubyzip (>= 1.2.1, < 2.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -99,7 +99,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.5) - naturally (2.1.0) + naturally (2.2.0) os (0.9.6) plist (3.4.0) public_suffix (2.0.5) @@ -131,7 +131,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.2) + unicode-display_width (1.3.3) word_wrap (1.0.0) xcodeproj (1.5.9) CFPropertyList (>= 2.3.3, < 4.0) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8a2da0ed..df4183a6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -102,8 +102,8 @@ android { applicationId "com.monicahq.app" minSdkVersion 16 targetSdkVersion 27 - versionCode 7 - versionName "0.5.0" + versionCode 9 + versionName "0.6.0" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 098f85a7..e0ac2600 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -12,7 +12,7 @@ default_platform(:android) platform :android do - desc "Submit a new Beta Build to Android Play store" + desc "Submit a new Alpha Build to Android Play store" lane :alpha do increment_version_code gradle(task: "assembleRelease") @@ -23,6 +23,17 @@ platform :android do ) end + desc "Submit a new Beta Build to Android Play store" + lane :beta do + increment_version_code + gradle(task: "assembleRelease") + + supply( + track: "beta", + apk: "#{lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]}" + ) + end + lane :version do |options| android_set_version_name( version_name: options[:version], diff --git a/android/fastlane/README.md b/android/fastlane/README.md index dbf3e1d2..2813207d 100644 --- a/android/fastlane/README.md +++ b/android/fastlane/README.md @@ -20,6 +20,11 @@ or alternatively using `brew cask install fastlane` ``` fastlane android alpha ``` +Submit a new Alpha Build to Android Play store +### android beta +``` +fastlane android beta +``` Submit a new Beta Build to Android Play store ### android version ``` diff --git a/android/gradle.properties b/android/gradle.properties index feced5a3..a6d5e412 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -18,6 +18,7 @@ # org.gradle.parallel=true android.useDeprecatedNdk=true +android.enableAapt2=false MONICA_RELEASE_STORE_FILE=../mobile-credentials/android/monica-release.keystore MONICA_RELEASE_KEY_ALIAS=monica-alias diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock index e3974a78..17306e5d 100644 --- a/ios/Gemfile.lock +++ b/ios/Gemfile.lock @@ -18,7 +18,7 @@ GEM dotenv (2.4.0) emoji_regex (0.1.1) excon (0.62.0) - faraday (0.15.1) + faraday (0.15.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) @@ -26,7 +26,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.3) - fastlane (2.96.1) + fastlane (2.97.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -50,7 +50,7 @@ GEM multipart-post (~> 2.0.0) plist (>= 3.1.0, < 4.0.0) public_suffix (~> 2.0.0) - rubyzip (>= 1.1.0, < 2.0.0) + rubyzip (>= 1.2.1, < 2.0.0) security (= 0.1.3) simctl (~> 1.6.3) slack-notifier (>= 2.0.0, < 3.0.0) @@ -97,7 +97,7 @@ GEM multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.5) - naturally (2.1.0) + naturally (2.2.0) os (0.9.6) plist (3.4.0) public_suffix (2.0.5) @@ -129,7 +129,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.3.2) + unicode-display_width (1.3.3) word_wrap (1.0.0) xcodeproj (1.5.9) CFPropertyList (>= 2.3.3, < 4.0) diff --git a/ios/Monica-tvOS/Info.plist b/ios/Monica-tvOS/Info.plist index b74d1468..829d6472 100644 --- a/ios/Monica-tvOS/Info.plist +++ b/ios/Monica-tvOS/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.0 + 0.6.0 CFBundleSignature ???? CFBundleVersion - 23 + 25 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/ios/Monica-tvOSTests/Info.plist b/ios/Monica-tvOSTests/Info.plist index 746ff281..afb563e6 100644 --- a/ios/Monica-tvOSTests/Info.plist +++ b/ios/Monica-tvOSTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.5.0 + 0.6.0 CFBundleSignature ???? CFBundleVersion - 23 + 25 diff --git a/ios/Monica.xcodeproj/project.pbxproj b/ios/Monica.xcodeproj/project.pbxproj index a6229338..184466eb 100644 --- a/ios/Monica.xcodeproj/project.pbxproj +++ b/ios/Monica.xcodeproj/project.pbxproj @@ -1816,7 +1816,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_ENTITLEMENTS = Monica/Monica.entitlements; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 25; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = MVHSH3DLRY; HEADER_SEARCH_PATHS = ( @@ -1853,7 +1853,7 @@ CODE_SIGN_ENTITLEMENTS = Monica/Monica.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 23; + CURRENT_PROJECT_VERSION = 25; DEVELOPMENT_TEAM = MVHSH3DLRY; HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/Monica/Info.plist b/ios/Monica/Info.plist index aee7111c..86dbb7f4 100644 --- a/ios/Monica/Info.plist +++ b/ios/Monica/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.0 + 0.6.0 CFBundleSignature ???? CFBundleVersion - 23 + 25 CodePushDeploymentKey i2oKT3PzZCZzwbJSF7Yb3HIo35lhH103vGVHM ITSAppUsesNonExemptEncryption diff --git a/ios/MonicaTests/Info.plist b/ios/MonicaTests/Info.plist index 746ff281..afb563e6 100644 --- a/ios/MonicaTests/Info.plist +++ b/ios/MonicaTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.5.0 + 0.6.0 CFBundleSignature ???? CFBundleVersion - 23 + 25 diff --git a/package.json b/package.json index eac94b4c..c35e75f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "monica", - "version": "0.5.1", + "version": "0.6.0", "private": true, "scripts": { "commit": "commit",