From 27bdaaac0b26c437890719a9219ca9b97951ac9d Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 8 Jul 2019 12:52:31 +0200 Subject: [PATCH 01/12] Remove redundant check --- tools/release-checks.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/release-checks.sh b/tools/release-checks.sh index 0fec98891617..1d253443ebea 100755 --- a/tools/release-checks.sh +++ b/tools/release-checks.sh @@ -74,14 +74,8 @@ function printVersion() { echo "$BUILDFILE version $gradle_version" } -function checkThatConfigurationFilesAreUpToDate() { - bundle exec fastlane run configure_validate - pOk -} - checkNewLanguages checkENStrings -checkThatConfigurationFilesAreUpToDate printVersion # checkDeviceToTest # runConnectedTests From 6887c9185b0ae988eddcf85e3f1ab767219ec96d Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 8 Jul 2019 12:53:01 +0200 Subject: [PATCH 02/12] Update finalize lane --- Gemfile.lock | 6 ++---- fastlane/Fastfile | 2 ++ fastlane/Pluginfile | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 51c616ebaa39..05f62721c7c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,5 @@ -GIT - remote: https://github.com/wordpress-mobile/release-toolkit - revision: e1833343a11f01526c606c3f0215875aea77c2c7 - ref: e1833343a11f01526c606c3f0215875aea77c2c7 +PATH + remote: ../release-toolkit specs: fastlane-plugin-wpmreleasetoolkit (0.5.0) diffy (~> 3.3) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1b7064a4bab5..5a9e21b06f5c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -170,6 +170,8 @@ ENV["HAS_ALPHA_VERSION"]="true" lane :finalize_release do | options | android_finalize_prechecks(options) android_update_metadata(options) unless android_current_branch_is_hotfix + android_bump_version_final_release() unless android_current_branch_is_hotfix + android_tag_build(tag_alpha: false) end ##################################################################################### diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile index d2b8c0e0b58f..3158b0644c1b 100644 --- a/fastlane/Pluginfile +++ b/fastlane/Pluginfile @@ -2,7 +2,8 @@ # # Ensure this file is checked in to source control! -gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', ref:'e1833343a11f01526c606c3f0215875aea77c2c7' +#gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', ref:'e1833343a11f01526c606c3f0215875aea77c2c7' +gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../../wordpress-mobile/release-toolkit' From 04c2fad5c4f640a057b3684f5f11b813bdd79031 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 8 Jul 2019 12:53:16 +0200 Subject: [PATCH 03/12] Remove unused actions --- .../android_current_branch_is_hotfix.rb | 46 ---------- .../actions/android_finalize_prechecks.rb | 74 ----------------- fastlane/actions/android_update_metadata.rb | 48 ----------- .../actions/android_update_metadata_source.rb | 83 ------------------- 4 files changed, 251 deletions(-) delete mode 100644 fastlane/actions/android_current_branch_is_hotfix.rb delete mode 100644 fastlane/actions/android_finalize_prechecks.rb delete mode 100644 fastlane/actions/android_update_metadata.rb delete mode 100644 fastlane/actions/android_update_metadata_source.rb diff --git a/fastlane/actions/android_current_branch_is_hotfix.rb b/fastlane/actions/android_current_branch_is_hotfix.rb deleted file mode 100644 index a1de7634f7b1..000000000000 --- a/fastlane/actions/android_current_branch_is_hotfix.rb +++ /dev/null @@ -1,46 +0,0 @@ -module Fastlane - module Actions - module SharedValues - ANDROID_CURRENT_BRANCH_IS_HOTFIX_CUSTOM_VALUE = :ANDROID_CURRENT_BRANCH_IS_HOTFIX_CUSTOM_VALUE - end - - class AndroidCurrentBranchIsHotfixAction < Action - def self.run(params) - require_relative '../helpers/android_version_helper.rb' - Fastlane::Helpers::AndroidVersionHelper::is_hotfix(Fastlane::Helpers::AndroidVersionHelper::get_version_name) - end - - ##################################################### - # @!group Documentation - ##################################################### - - def self.description - "Checks if the current branch is for a hotfix" - end - - def self.details - "Checks if the current branch is for a hotfix" - end - - def self.available_options - - end - - def self.output - - end - - def self.return_value - "True if the branch is for a hotfix, false otherwise" - end - - def self.authors - ["loremattei"] - end - - def self.is_supported?(platform) - platform == :android - end - end - end -end diff --git a/fastlane/actions/android_finalize_prechecks.rb b/fastlane/actions/android_finalize_prechecks.rb deleted file mode 100644 index 1f7f4f8b0c12..000000000000 --- a/fastlane/actions/android_finalize_prechecks.rb +++ /dev/null @@ -1,74 +0,0 @@ -module Fastlane - module Actions - module SharedValues - ANDROID_FINALIZE_PRECHECKS_CUSTOM_VALUE = :ANDROID_FINALIZE_PRECHECKS_CUSTOM_VALUE - end - - class AndroidFinalizePrechecksAction < Action - def self.run(params) - UI.message "Skip confirm: #{params[:skip_confirm]}" - - require_relative '../helpers/android_version_helper.rb' - require_relative '../helpers/android_git_helper.rb' - - UI.user_error!("This is not a release branch. Abort.") unless other_action.git_branch.start_with?("release/") - - version = Fastlane::Helpers::AndroidVersionHelper::get_version_name - message = "Finalizing release: #{version}\n" - if (!params[:skip_confirm]) - if (!UI.confirm("#{message}Do you want to continue?")) - UI.user_error!("Aborted by user request") - end - else - UI.message(message) - end - - # Check local repo status - other_action.ensure_git_status_clean() - - version - end - - ##################################################### - # @!group Documentation - ##################################################### - - def self.description - "Runs some prechecks before finalizing a release" - end - - def self.details - "Runs some prechecks before finalizing a release" - end - - def self.available_options - # Define all options your action supports. - - # Below a few examples - [ - FastlaneCore::ConfigItem.new(key: :skip_confirm, - env_name: "FL_ANDROID_FINALIZE_PRECHECKS_SKIPCONFIRM", - description: "Skips confirmation", - is_string: false, # true: verifies the input is a string, false: every kind of value - default_value: false) # the default value if the user didn't provide one - ] - end - - def self.output - - end - - def self.return_value - "The current app version" - end - - def self.authors - ["loremattei"] - end - - def self.is_supported?(platform) - platform == :android - end - end - end -end diff --git a/fastlane/actions/android_update_metadata.rb b/fastlane/actions/android_update_metadata.rb deleted file mode 100644 index 248d101bc576..000000000000 --- a/fastlane/actions/android_update_metadata.rb +++ /dev/null @@ -1,48 +0,0 @@ -module Fastlane - module Actions - module SharedValues - ANDROID_UPDATE_METADATA_CUSTOM_VALUE = :ANDROID_UPDATE_METADATA_CUSTOM_VALUE - end - - class AndroidUpdateMetadataAction < Action - def self.run(params) - require_relative '../helpers/android_git_helper.rb' - - Fastlane::Helpers::AndroidGitHelper.update_metadata() - Fastlane::Action::sh("./tools/release-checks.sh") - end - - ##################################################### - # @!group Documentation - ##################################################### - - def self.description - "Downloads translated metadata from the translation system" - end - - def self.details - "Downloads translated metadata from the translation system" - end - - def self.available_options - - end - - def self.output - - end - - def self.return_value - - end - - def self.authors - ["loremattei"] - end - - def self.is_supported?(platform) - platform == :android - end - end - end -end diff --git a/fastlane/actions/android_update_metadata_source.rb b/fastlane/actions/android_update_metadata_source.rb deleted file mode 100644 index 1a64ce159685..000000000000 --- a/fastlane/actions/android_update_metadata_source.rb +++ /dev/null @@ -1,83 +0,0 @@ -module Fastlane - module Actions - class AndroidUpdateMetadataSourceAction < Action - def self.run(params) - # Check local repo status - other_action.ensure_git_status_clean() - - other_action.an_update_metadata_source(po_file_path: params[:po_file_path], - source_files: params[:source_files], - release_version: params[:release_version]) - - Action.sh("git add #{params[:po_file_path]}") - params[:source_files].each do | key, file | - Action.sh("git add #{file}") - end - - repo_status = Actions.sh("git status --porcelain") - repo_clean = repo_status.empty? - if (!repo_clean) then - Action.sh("git commit -m \"Update metadata strings\"") - Action.sh("git push") - end - end - - ##################################################### - # @!group Documentation - ##################################################### - - def self.description - "Updates the PlayStoreStrings.po file with the data from text source files" - end - - def self.details - "Updates the PlayStoreStrings.po file with the data from text source files" - end - - def self.available_options - # Define all options your action supports. - - # Below a few examples - [ - FastlaneCore::ConfigItem.new(key: :po_file_path, - env_name: "FL_ANDROID_UPDATE_METADATA_SOURCE_PO_FILE_PATH", - description: "The path of the .po file to update", - is_string: true, - verify_block: proc do |value| - UI.user_error!("No .po file path for UpdateMetadataSourceAction given, pass using `po_file_path: 'file path'`") unless (value and not value.empty?) - UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value) - end), - FastlaneCore::ConfigItem.new(key: :release_version, - env_name: "FL_ANDROID_UPDATE_METADATA_SOURCE_RELEASE_VERSION", - description: "The release version of the app (to use to mark the release notes)", - verify_block: proc do |value| - UI.user_error!("No relase version for UpdateMetadataSourceAction given, pass using `release_version: 'version'`") unless (value and not value.empty?) - end), - FastlaneCore::ConfigItem.new(key: :source_files, - env_name: "FL_ANDROID_UPDATE_METADATA_SOURCE_SOURCE_FILES", - description: "The hash with the path to the source files and the key to use to include their content", - is_string: false, - verify_block: proc do |value| - UI.user_error!("No source file hash for UpdateMetadataSourceAction given, pass using `source_files: 'source file hash'`") unless (value and not value.empty?) - end) - ] - end - - def self.output - - end - - def self.return_value - - end - - def self.authors - ["loremattei"] - end - - def self.is_supported?(platform) - platform == :android - end - end - end -end From ed9fe139e433667157a237dc1f5198685287fbef Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 8 Jul 2019 18:38:46 +0200 Subject: [PATCH 04/12] Update metadata download lane --- fastlane/Fastfile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 5a9e21b06f5c..86535c506869 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -169,9 +169,18 @@ ENV["HAS_ALPHA_VERSION"]="true" desc "Updates store metadata and runs the release checks" lane :finalize_release do | options | android_finalize_prechecks(options) - android_update_metadata(options) unless android_current_branch_is_hotfix - android_bump_version_final_release() unless android_current_branch_is_hotfix + hotfix = android_current_branch_is_hotfix + android_update_metadata(options) unless hotfix + android_bump_version_final_release() unless hotfix + version = android_get_release_version() unless hotfix + download_metadata_strings(version: version["name"], build_number: version["code"]) unless hotfix android_tag_build(tag_alpha: false) + + # Wrap up + removebranchprotection(repository:GHHELPER_REPO, branch: "release/#{version["name"]}") + setfrozentag(repository:GHHELPER_REPO, milestone: version["name"], freeze: false) + close_milestone(repository:GHHELPER_REPO, milestone: version["name"]) + create_new_milestone(repository:GHHELPER_REPO) end ##################################################################################### @@ -289,11 +298,15 @@ ENV["HAS_ALPHA_VERSION"]="true" } delete_old_changelogs(build: options[:build_number]) + download_path=Dir.pwd + "/metadata/android" gp_downloadmetadata(project_url: "https://translate.wordpress.org/projects/apps/android/release-notes/", target_files: files, locales: SUPPORTED_LOCALES.map {| hsh | [ hsh[:glotpress], hsh[:google_play] ]}, source_locale: "en-US", - download_path: Dir.pwd + "/metadata/android") + download_path: download_path) + + android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: SUPPORTED_LOCALES.map {| hsh | [ hsh[:glotpress], hsh[:google_play] ]}) + sh("git add #{download_path} && git commit -m \"Update metadata translations for #{options[:version]}\" && git push") end ######################################################################## From 9d79b3a78f35481f1d1238caaac494c05b06f7e3 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 8 Jul 2019 18:55:57 +0200 Subject: [PATCH 05/12] Update to the latest release-toolkit --- Gemfile.lock | 6 ++++-- fastlane/Pluginfile | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 05f62721c7c5..878972475c61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,7 @@ -PATH - remote: ../release-toolkit +GIT + remote: https://github.com/wordpress-mobile/release-toolkit + revision: 74f7c92135ff0422c336964c782ee6bebb46cfa1 + ref: 74f7c92135ff0422c336964c782ee6bebb46cfa1 specs: fastlane-plugin-wpmreleasetoolkit (0.5.0) diffy (~> 3.3) diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile index 3158b0644c1b..71d6c66c4969 100644 --- a/fastlane/Pluginfile +++ b/fastlane/Pluginfile @@ -2,8 +2,7 @@ # # Ensure this file is checked in to source control! -#gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', ref:'e1833343a11f01526c606c3f0215875aea77c2c7' -gem 'fastlane-plugin-wpmreleasetoolkit', path: '../../../wordpress-mobile/release-toolkit' +gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', ref:'74f7c92135ff0422c336964c782ee6bebb46cfa1' From e90bd8a430830fea6cc482e2554a8ea7351c9c5f Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Wed, 17 Jul 2019 10:05:10 +0200 Subject: [PATCH 06/12] Revert setting editor preferecen to Remote --- .../android/ui/posts/EditPostActivity.java | 3 -- .../android/ui/prefs/AppSettingsFragment.java | 1 - .../wordpress/android/util/WPPrefUtils.java | 30 ------------------- 3 files changed, 34 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index 9cbe88698b88..abe31f2d9203 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -159,7 +159,6 @@ import org.wordpress.android.util.WPHtml; import org.wordpress.android.util.WPMediaUtils; import org.wordpress.android.util.WPPermissionUtils; -import org.wordpress.android.util.WPPrefUtils; import org.wordpress.android.util.WPUrlUtils; import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.helpers.MediaFile; @@ -2286,10 +2285,8 @@ public Fragment getItem(int position) { setGutenbergEnabledIfNeeded(); String languageString = LocaleManager.getLanguage(EditPostActivity.this); String wpcomLocaleSlug = languageString.replace("_", "-").toLowerCase(Locale.ENGLISH); - WPPrefUtils.setMobileEditorPreferenceToRemote(mDispatcher, mSiteStore); return GutenbergEditorFragment.newInstance("", "", mIsNewPost, wpcomLocaleSlug); } else if (mShowAztecEditor) { - WPPrefUtils.setMobileEditorPreferenceToRemote(mDispatcher, mSiteStore); return AztecEditorFragment.newInstance("", "", AppPrefs.isAztecEditorToolbarExpanded()); } else if (mShowNewEditor) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java index a484b63b0da4..a4b9d47f4ce7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppSettingsFragment.java @@ -304,7 +304,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { AppPrefs.setGutenbergDefaultForNewPosts((Boolean) newValue); // we need to refresh metadata as gutenberg_enabled is now part of the user data AnalyticsUtils.refreshMetadata(mAccountStore, mSiteStore); - WPPrefUtils.setMobileEditorPreferenceToRemote(mDispatcher, mSiteStore); } else if (preference == mStripImageLocation) { AppPrefs.setStripImageLocation((Boolean) newValue); } diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java index c9b91af75e29..d223bd6087d6 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java @@ -9,14 +9,6 @@ import android.widget.TextView; import org.wordpress.android.R; -import org.wordpress.android.fluxc.Dispatcher; -import org.wordpress.android.fluxc.generated.SiteActionBuilder; -import org.wordpress.android.fluxc.model.SiteModel; -import org.wordpress.android.fluxc.store.SiteStore; -import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorPayload; -import org.wordpress.android.ui.prefs.AppPrefs; - -import java.util.List; /** * Design guidelines for Calypso-styled Site Settings (and likely other screens) @@ -168,26 +160,4 @@ public static void setTextViewAttributes(TextView textView, int size, int colorR textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); textView.setTextColor(textView.getResources().getColor(colorRes)); } - - public static void setMobileEditorPreferenceToRemote(final Dispatcher dispatcher, final SiteStore siteStore) { - final List sitesAccessedViaWPComRest = siteStore.getSitesAccessedViaWPComRest(); - final boolean setDelay = sitesAccessedViaWPComRest.size() > 5; - final String editorSetting = AppPrefs.isGutenbergDefaultForNewPosts() ? "gutenberg" : "aztec"; - new Thread(new Runnable() { - @Override - public void run() { - for (SiteModel currentSite : sitesAccessedViaWPComRest) { - dispatcher.dispatch(SiteActionBuilder.newDesignateMobileEditorAction( - new DesignateMobileEditorPayload(currentSite, editorSetting))); - if (setDelay) { - try { - Thread.sleep(200); - } catch (InterruptedException e) { - // no-op - } - } - } - } - }).start(); - } } From d2622000d0178263ce5d9dd20d77732f09ce6820 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Wed, 17 Jul 2019 13:01:27 +0200 Subject: [PATCH 07/12] Update release notes for 12.9 --- WordPress/metadata/release_notes.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index 9d8a194e5cd3..5a344cf652d2 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1,4 +1,3 @@ -* In Posts and Pages, Authors, Tags, and Categories Stats cards, a percentage bar has been added to communicate the impact of each item. -* You can now search posts on the Post List page. -* New! Widgets for All-time, Today, and Weekly Stats are now available. -* Block Editor: Fixed a bug that affected pasting text into the Post Title. +* Customers with unclaimed domain credits can register domains in the app. +* You can expand the Comment Editor to Full Screen for more space while editing. +* The Block editor has a few improvements: Video blocks are available, and a some issues that led to content loss when using unsupported blocks have been resolved. From 9214bb537d3066498b5d94cda4fe3512da586569 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Wed, 17 Jul 2019 13:07:01 +0200 Subject: [PATCH 08/12] Update App Store descriptions --- WordPress/metadata/full_description.txt | 44 +++++++++++++++++++++--- WordPress/metadata/short_description.txt | 2 +- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/WordPress/metadata/full_description.txt b/WordPress/metadata/full_description.txt index a6204b0580f7..0203cc20e3f6 100644 --- a/WordPress/metadata/full_description.txt +++ b/WordPress/metadata/full_description.txt @@ -1,9 +1,43 @@ -Manage or create your WordPress blog or website right from your Android device: create and edit posts and pages, upload your favorite photos and videos, view stats and reply to comments. +WordPress for Android puts the power of web publishing in your pocket. It’s a website creator and so much more! -With WordPress for Android, you have the power to publish in the palm of your hand. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments, or check your stats to see what new countries today's readers are coming from. +CREATE +- Give your big ideas a home on the web. WordPress for Android is a website builder and a blog maker. Use it to create your website. +- Pick the right look and feel from a wide selection of WordPress themes, then customize with photos, colors, and fonts so it’s uniquely you. +- Built-in Quick Start tips guide you through the setup basics to set your new website up for success. (We’re not just a website creator -- we’re your partner and cheering squad!) -WordPress for Android is an Open Source project, which means you too can contribute to its development. Learn more at https://apps.wordpress.com/contribute/. +STATS +- Check your website’s stats in real time to keep track of the activity on your site. +- Track which posts and pages get the most traffic over time by exploring daily, weekly, monthly, and yearly insights. +- Use the traffic map to see which countries your visitors come from. -WordPress for Android supports WordPress.com and self-hosted WordPress.org sites running WordPress 4.0 or higher. +NOTIFICATIONS +- Get notifications about comments, likes, and new followers so you can see people reacting to your website as it happens. +- Reply to new comments as they show up to keep the conversation flowing and acknowledge your readers. -Need help with the app? Visit the forums at https://android.forums.wordpress.org/forum/troubleshooting or tweet us @WPAndroid. \ No newline at end of file +PUBLISH +- Create updates, stories, photo essays announcements -- anything! -- with the editor. +- Bring your posts and pages to life with photos and video from your camera and albums, or find the perfect image with the in-app collection of free-to-use pro photography. +- Save ideas as drafts and come back to them when your muse returns, or schedule new posts for the future so your site is always fresh and engaging. +- Add tags and categories to help new readers discover your posts, and watch your audience grow. + +READER +- WordPress is more than a blog maker — use it to connect with a community of writers in the WordPress Reader. Explore thousands of topics by tag, discover new authors and organizations, and follow the ones who pique your interest. +- Hang on to the posts that fascinate you with the Save for later feature. + +SHARE +- Set up automated sharing to tell your followers on social media when you publish a new post. Automatically cross-post to Facebook, Twitter, and more. +- Add social sharing buttons to your posts so your visitors can share them with their network, and let your fans become your ambassadors. + +Why WordPress? + +There are a lot of blogging services, website builders, and social networks out there. Why create your website with WordPress? + +WordPress powers over a third of the web. It’s used by hobby blogs, businesses of all sizes, online stores, even the biggest news sites on the internet. Odds are that many of your favorite websites are running on WordPress. + +With WordPress, you own your own content. Other social networks treat you as a commodity, and assume ownership of the content you post. But with WordPress anything you publish is yours, and you can take it with you wherever you’d like. + +WordPress is an open source website creator, meaning anyone can see how it's made, and even contribute. Other services and social networks are proprietary, closed systems; you can never be sure exactly how they work or what they are doing -- and they can disappear! + +Whether you need a website builder to create your website, or a simple blog maker, WordPress can help. It gives you beautiful designs, powerful features, and the freedom to build anything you want. + +WordPress for Android supports self-hosted sites running WordPress 4.0 and later, and all sites at WordPress.com. Just like WordPress, WordPress for Android is open source. Learn more at https://apps.wordpress.com/contribute/. Need help with the app? Send us a tweet at @WPAndroid, or visit our forums at https://android.forums.wordpress.org/forum/troubleshooting. \ No newline at end of file diff --git a/WordPress/metadata/short_description.txt b/WordPress/metadata/short_description.txt index cb07c97c8298..25c09b5b38d5 100644 --- a/WordPress/metadata/short_description.txt +++ b/WordPress/metadata/short_description.txt @@ -1 +1 @@ -Share posts and photos, monitor stats, keep up with blogs you follow, and more! \ No newline at end of file +Easily build your website & blog. Create posts & track analytics from anywhere! \ No newline at end of file From bc195f294d9aa320d1479da86c06091408854cc6 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Wed, 17 Jul 2019 13:08:21 +0200 Subject: [PATCH 09/12] Update metadata strings --- WordPress/metadata/PlayStoreStrings.po | 62 ++++++++++++++++++++------ 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po index 8fa38f7cbf2a..0abcdbe04852 100644 --- a/WordPress/metadata/PlayStoreStrings.po +++ b/WordPress/metadata/PlayStoreStrings.po @@ -11,6 +11,14 @@ msgstr "" "Project-Id-Version: Release Notes & Play Store Descriptions\n" #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas! +msgctxt "release_note_129" +msgid "" +"12.9:\n" +"* Customers with unclaimed domain credits can register domains in the app.\n" +"* You can expand the Comment Editor to Full Screen for more space while editing.\n" +"* The Block editor has a few improvements: Video blocks are available, and a some issues that led to content loss when using unsupported blocks have been resolved.\n" +msgstr "" + msgctxt "release_note_128" msgid "" "12.8:\n" @@ -20,14 +28,6 @@ msgid "" "* Block Editor: Fixed a bug that affected pasting text into the Post Title.\n" msgstr "" -msgctxt "release_note_127" -msgid "" -"12.7:\n" -"* Quote and More blocks are now available, and we fixed an issue that caused the keyboard in the editor to flicker if you repeatedly pressed Enter on a post title.\n" -"* Business plan customers can register a custom domain when installing a plugin.\n" -"* Sometimes when you started a new draft, the app would create two. Fixed!\n" -msgstr "" - msgctxt "sample_post_content" msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility." msgstr "" @@ -50,21 +50,55 @@ msgstr "" #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas! msgctxt "play_store_promo" -msgid "Share posts and photos, monitor stats, keep up with blogs you follow, and more!" +msgid "Easily build your website & blog. Create posts & track analytics from anywhere!" msgstr "" #. translators: Multi-paragraph text used to display in the Play Store. msgctxt "play_store_desc" msgid "" -"Manage or create your WordPress blog or website right from your Android device: create and edit posts and pages, upload your favorite photos and videos, view stats and reply to comments.\n" +"WordPress for Android puts the power of web publishing in your pocket. It’s a website creator and so much more!\n" +"\n" +"CREATE\n" +"- Give your big ideas a home on the web. WordPress for Android is a website builder and a blog maker. Use it to create your website.\n" +"- Pick the right look and feel from a wide selection of WordPress themes, then customize with photos, colors, and fonts so it’s uniquely you.\n" +"- Built-in Quick Start tips guide you through the setup basics to set your new website up for success. (We’re not just a website creator -- we’re your partner and cheering squad!)\n" +"\n" +"STATS\n" +"- Check your website’s stats in real time to keep track of the activity on your site.\n" +"- Track which posts and pages get the most traffic over time by exploring daily, weekly, monthly, and yearly insights.\n" +"- Use the traffic map to see which countries your visitors come from.\n" +"\n" +"NOTIFICATIONS\n" +"- Get notifications about comments, likes, and new followers so you can see people reacting to your website as it happens.\n" +"- Reply to new comments as they show up to keep the conversation flowing and acknowledge your readers.\n" +"\n" +"PUBLISH\n" +"- Create updates, stories, photo essays announcements -- anything! -- with the editor.\n" +"- Bring your posts and pages to life with photos and video from your camera and albums, or find the perfect image with the in-app collection of free-to-use pro photography.\n" +"- Save ideas as drafts and come back to them when your muse returns, or schedule new posts for the future so your site is always fresh and engaging.\n" +"- Add tags and categories to help new readers discover your posts, and watch your audience grow.\n" +"\n" +"READER\n" +"- WordPress is more than a blog maker — use it to connect with a community of writers in the WordPress Reader. Explore thousands of topics by tag, discover new authors and organizations, and follow the ones who pique your interest.\n" +"- Hang on to the posts that fascinate you with the Save for later feature.\n" +"\n" +"SHARE\n" +"- Set up automated sharing to tell your followers on social media when you publish a new post. Automatically cross-post to Facebook, Twitter, and more.\n" +"- Add social sharing buttons to your posts so your visitors can share them with their network, and let your fans become your ambassadors.\n" +"\n" +"Why WordPress?\n" +"\n" +"There are a lot of blogging services, website builders, and social networks out there. Why create your website with WordPress?\n" +"\n" +"WordPress powers over a third of the web. It’s used by hobby blogs, businesses of all sizes, online stores, even the biggest news sites on the internet. Odds are that many of your favorite websites are running on WordPress.\n" "\n" -"With WordPress for Android, you have the power to publish in the palm of your hand. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments, or check your stats to see what new countries today's readers are coming from.\n" +"With WordPress, you own your own content. Other social networks treat you as a commodity, and assume ownership of the content you post. But with WordPress anything you publish is yours, and you can take it with you wherever you’d like.\n" "\n" -"WordPress for Android is an Open Source project, which means you too can contribute to its development. Learn more at https://apps.wordpress.com/contribute/.\n" +"WordPress is an open source website creator, meaning anyone can see how it's made, and even contribute. Other services and social networks are proprietary, closed systems; you can never be sure exactly how they work or what they are doing -- and they can disappear!\n" "\n" -"WordPress for Android supports WordPress.com and self-hosted WordPress.org sites running WordPress 4.0 or higher.\n" +"Whether you need a website builder to create your website, or a simple blog maker, WordPress can help. It gives you beautiful designs, powerful features, and the freedom to build anything you want.\n" "\n" -"Need help with the app? Visit the forums at https://android.forums.wordpress.org/forum/troubleshooting or tweet us @WPAndroid.\n" +"WordPress for Android supports self-hosted sites running WordPress 4.0 and later, and all sites at WordPress.com. Just like WordPress, WordPress for Android is open source. Learn more at https://apps.wordpress.com/contribute/. Need help with the app? Send us a tweet at @WPAndroid, or visit our forums at https://android.forums.wordpress.org/forum/troubleshooting.\n" msgstr "" #. translators: Title to be displayed in the Play Store. Limit to 50 characters including spaces and commas! From 1895b0dc12441d976c10414cf1e3a48172f90439 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Wed, 17 Jul 2019 23:31:37 +0200 Subject: [PATCH 10/12] Update release-toolkit to 0.6.0 --- .bundle/config | 1 + Gemfile.lock | 14 +++++++------- fastlane/Pluginfile | 6 +++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.bundle/config b/.bundle/config index 2369228816d4..da970cb8c12e 100644 --- a/.bundle/config +++ b/.bundle/config @@ -1,2 +1,3 @@ --- BUNDLE_PATH: "vendor/bundle" +BUNDLE_WITHOUT: "screenshots" diff --git a/Gemfile.lock b/Gemfile.lock index 878972475c61..e9d6de0422b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/wordpress-mobile/release-toolkit - revision: 74f7c92135ff0422c336964c782ee6bebb46cfa1 - ref: 74f7c92135ff0422c336964c782ee6bebb46cfa1 + revision: 9cefa93fed199849a9e53619e2576012412a4d67 + ref: 0.6.0 specs: - fastlane-plugin-wpmreleasetoolkit (0.5.0) + fastlane-plugin-wpmreleasetoolkit (0.6.0) diffy (~> 3.3) git (~> 1.3) jsonlint @@ -13,7 +13,6 @@ GIT progress_bar (~> 1.3) rake (~> 12.3) rake-compiler (~> 1.0) - rmagick (~> 3.0) GEM remote: https://rubygems.org/ @@ -32,7 +31,7 @@ GEM declarative-option (0.1.0) diffy (3.3.0) digest-crc (0.4.1) - domain_name (0.5.20180417) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.4) emoji_regex (1.0.1) @@ -132,7 +131,7 @@ GEM mini_portile2 (~> 2.4.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) - oj (3.7.12) + oj (3.8.0) optimist (3.0.0) options (2.3.2) os (1.0.1) @@ -179,7 +178,7 @@ GEM unf_ext (0.0.7.6) unicode-display_width (1.6.0) word_wrap (1.0.0) - xcodeproj (1.10.0) + xcodeproj (1.11.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -197,6 +196,7 @@ DEPENDENCIES fastlane (= 2.126)! fastlane-plugin-wpmreleasetoolkit! nokogiri! + rmagick (~> 3.2.0) BUNDLED WITH 1.17.3 diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile index 71d6c66c4969..e985f91e06f8 100644 --- a/fastlane/Pluginfile +++ b/fastlane/Pluginfile @@ -2,7 +2,11 @@ # # Ensure this file is checked in to source control! -gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', ref:'74f7c92135ff0422c336964c782ee6bebb46cfa1' +group :screenshots, optional: true do + gem 'rmagick', '~> 3.2.0' +end + +gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', tag:'0.6.0' From 96ab0bbeea90de23c225c2a52361d976e07cf301 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Thu, 18 Jul 2019 12:08:55 +0200 Subject: [PATCH 11/12] Update release-toolkit --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e9d6de0422b9..537454b4d64d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/wordpress-mobile/release-toolkit - revision: 9cefa93fed199849a9e53619e2576012412a4d67 - ref: 0.6.0 + revision: c555066402074a527a9853932790da8198eb7f21 + tag: 0.6.0 specs: fastlane-plugin-wpmreleasetoolkit (0.6.0) diffy (~> 3.3) From 0e95d8b841f55b918cd8e99f2fdd7e7fbd11db47 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Thu, 18 Jul 2019 13:27:59 +0200 Subject: [PATCH 12/12] Bump version number --- WordPress/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index c0eb77bb059b..142f74340e4f 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -43,8 +43,8 @@ android { defaultConfig { applicationId "org.wordpress.android" - versionName "alpha-180" - versionCode 754 + versionName "alpha-181" + versionCode 756 minSdkVersion 21 targetSdkVersion 28 @@ -72,8 +72,8 @@ android { productFlavors { vanilla { // used for release and beta dimension "buildType" - versionName "12.9-rc-1" - versionCode 753 + versionName "12.9-rc-2" + versionCode 755 } zalpha { // alpha version - enable experimental features