From 61d340d97de07cd2833d2f40e126722d52834c2f Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Fri, 28 Dec 2018 09:20:36 -0300 Subject: [PATCH] Bump version to 1.16.0 and Build number to 167 (#2481) * Fix fastlane platform thumbnail * Bump app version number to 1.16.0 * Bump app build number to 167 --- android/app/build.gradle | 4 +- fastlane/Fastfile | 86 ++++++++++++++---------- ios/Mattermost.xcodeproj/project.pbxproj | 4 +- ios/Mattermost/Info.plist | 4 +- ios/MattermostShare/Info.plist | 4 +- ios/MattermostTests/Info.plist | 4 +- 6 files changed, 59 insertions(+), 47 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 958073723..6cd7e65dc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -113,8 +113,8 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 166 - versionName "1.15.1" + versionCode 167 + versionName "1.16.0" multiDexEnabled = true ndk { abiFilters "armeabi-v7a", "x86" diff --git a/fastlane/Fastfile b/fastlane/Fastfile index cc68eec55..fb962d6ee 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -309,15 +309,16 @@ platform :ios do error do |lane, exception| version = get_version_number(xcodeproj: './ios/Mattermost.xcodeproj', target: 'Mattermost') build_number = get_build_number(xcodeproj: './ios/Mattermost.xcodeproj') - send_message_to_mattermost( - version, - build_number, - '', - 'Unsuccessful Build', - exception.message, - [:lane], - false - ) + send_message_to_mattermost({ + :version_number => version, + :build_number => build_number, + :pretext => '', + :title => 'Unsuccessful Build', + :thumb_url => 'https://support.apple.com/library/content/dam/edam/applecare/images/en_US/iOS/move-to-ios-icon.png', + :msg => exception.message, + :default_payloads => [:lane], + :success => false + }) end def build_ios() @@ -438,7 +439,16 @@ platform :android do gradle_file: './android/app/build.gradle' ) - send_message_to_mattermost(version_number, build_number, '', 'Unsuccessful Build', exception.message, [:lane], false) + send_message_to_mattermost({ + :version_number => version_number, + :build_number => build_number, + :pretext => '', + :title => 'Unsuccessful Build', + :thumb_url => 'https://lh3.ggpht.com/XL0CrI8skkxnboGct-duyg-bZ_MxJDTrjczyjdU8OP2PM1dmj7SP4jL1K8JQeMIB3AM=w300', + :msg => exception.message, + :default_payloads => [:lane], + :success => false, + }) end def build_android() @@ -482,26 +492,26 @@ def save_config_json(json) end end -def send_message_to_mattermost(version_number, build_number, pretext, title, msg, default_payloads, success) +def send_message_to_mattermost(options) unless ENV['MATTERMOST_WEBHOOK_URL'].nil? || ENV['MATTERMOST_WEBHOOK_URL'].empty? mattermost( - pretext: pretext, - message: msg, - default_payloads: default_payloads, + pretext: options[:pretext], + message: options[:msg], + default_payloads: options[:default_payloads], username: 'Fastlane', icon_url: 'https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png', payload: {}, attachment_properties: { - title: title, - thumb_url: 'https://lh3.ggpht.com/XL0CrI8skkxnboGct-duyg-bZ_MxJDTrjczyjdU8OP2PM1dmj7SP4jL1K8JQeMIB3AM=w300', + title: options[:title], + thumb_url: options[:thumb_url], fields: [{ title: 'Version', - value: version_number, + value: options[:version_number], short: true }, { title: 'Build Number', - value: build_number, + value: options[:build_number], short: true }, { @@ -510,7 +520,7 @@ def send_message_to_mattermost(version_number, build_number, pretext, title, msg short: true }] }, - success: success + success: options[:success] ) end end @@ -545,15 +555,16 @@ def submit_to_store msg = 'Sign up as a beta tester [here](https://play.google.com/apps/testing/com.mattermost.rnbeta)' end - send_message_to_mattermost( - version_number, - build_number, - pretext, - '', - msg, - [], - true - ) + send_message_to_mattermost({ + :version_number => version_number, + :build_number => build_number, + :pretext => pretext, + :title => '', + :thumb_url => 'https://lh3.ggpht.com/XL0CrI8skkxnboGct-duyg-bZ_MxJDTrjczyjdU8OP2PM1dmj7SP4jL1K8JQeMIB3AM=w300', + :msg => msg, + :default_payloads => [], + :success => true, + }) end # Submit to TestFlight if required @@ -574,15 +585,16 @@ def submit_to_store version = get_version_number(xcodeproj: './ios/Mattermost.xcodeproj', target: 'Mattermost') build_number = get_build_number(xcodeproj: './ios/Mattermost.xcodeproj') - send_message_to_mattermost( - version, - build_number, - pretext, - '', - msg, - [], - true - ) + send_message_to_mattermost({ + :version_number => version_number, + :build_number => build_number, + :pretext => pretext, + :title => '', + :thumb_url => 'https://support.apple.com/library/content/dam/edam/applecare/images/en_US/iOS/move-to-ios-icon.png', + :msg => msg, + :default_payloads => [], + :success => true, + }) end unless apk_path.nil? diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 19476c008..06651c8e0 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -2527,7 +2527,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 166; + CURRENT_PROJECT_VERSION = 167; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2579,7 +2579,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 166; + CURRENT_PROJECT_VERSION = 167; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index fe43e8111..e3942e679 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.15.1 + 1.16.0 CFBundleSignature ???? CFBundleURLTypes @@ -34,7 +34,7 @@ CFBundleVersion - 166 + 167 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index f0250c964..55275de19 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -21,9 +21,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.15.1 + 1.16.0 CFBundleVersion - 166 + 167 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index cdad0c8ef..8c9890e95 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.15.1 + 1.16.0 CFBundleSignature ???? CFBundleVersion - 166 + 167