diff --git a/Gemfile.lock b/Gemfile.lock index 6ad1e1d1986..fa0c59ff90c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,20 +17,20 @@ GEM ast (2.4.2) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.631.0) - aws-sdk-core (3.148.0) + aws-partitions (1.653.0) + aws-sdk-core (3.166.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.58.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.59.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.117.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.1) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) bigdecimal (1.4.4) @@ -94,7 +94,7 @@ GEM escape (0.0.4) ethon (0.15.0) ffi (>= 1.15.0) - excon (0.92.4) + excon (0.93.1) faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -124,7 +124,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.210.0) + fastlane (2.210.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -164,8 +164,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-appcenter (1.11.1) - fastlane-plugin-sentry (1.11.1) - fastlane-plugin-wpmreleasetoolkit (5.5.0) + fastlane-plugin-sentry (1.14.0) + os (~> 1.1, >= 1.1.4) + fastlane-plugin-wpmreleasetoolkit (5.6.0) activesupport (~> 5) bigdecimal (~> 1.4) buildkit (~> 1.5) @@ -188,9 +189,9 @@ GEM git (1.12.0) addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.26.0) - google-apis-core (>= 0.7, < 2.a) - google-apis-core (0.7.2) + google-apis-androidpublisher_v3 (0.29.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-core (0.9.1) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -199,27 +200,27 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.13.0) - google-apis-core (>= 0.7, < 2.a) - google-apis-playcustomapp_v1 (0.10.0) - google-apis-core (>= 0.7, < 2.a) - google-apis-storage_v1 (0.17.0) - google-apis-core (>= 0.7, < 2.a) + google-apis-iamcredentials_v1 (0.15.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-playcustomapp_v1 (0.12.0) + google-apis-core (>= 0.9.1, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.3.0) - google-cloud-storage (1.40.0) + google-cloud-storage (1.43.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.17.0) + google-apis-storage_v1 (~> 0.19.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.2.0) + googleauth (1.3.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -250,10 +251,10 @@ GEM nap (1.1.0) naturally (2.2.1) netrc (0.11.0) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.8-x86_64-darwin) + nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) diff --git a/Podfile b/Podfile index dfad847d18b..bd85eb5c362 100644 --- a/Podfile +++ b/Podfile @@ -65,7 +65,7 @@ target 'WooCommerce' do pod 'Gridicons', '~> 1.2.0' # To allow pod to pick up beta versions use -beta. E.g., 1.1.7-beta.1 - pod 'WordPressAuthenticator', '~> 3.3.0-beta.2' + pod 'WordPressAuthenticator', '~> 4.0.0' # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '' # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => '' # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS' diff --git a/Podfile.lock b/Podfile.lock index ea16fe5f3ee..a68d99c40ab 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -42,7 +42,7 @@ PODS: - WordPress-Aztec-iOS (1.11.0) - WordPress-Editor-iOS (1.11.0): - WordPress-Aztec-iOS (= 1.11.0) - - WordPressAuthenticator (3.3.0-beta.2): + - WordPressAuthenticator (4.0.0): - CocoaLumberjack (~> 3.5) - GoogleSignIn (~> 6.0.1) - Gridicons (~> 1.0) @@ -91,7 +91,7 @@ DEPENDENCIES: - Sourcery (~> 1.0.3) - StripeTerminal (~> 2.7) - WordPress-Editor-iOS (~> 1.11.0) - - WordPressAuthenticator (~> 3.3.0-beta.2) + - WordPressAuthenticator (~> 4.0.0) - WordPressKit (~> 4.49.0) - WordPressShared (~> 1.15) - WordPressUI (~> 1.12.5) @@ -101,8 +101,6 @@ DEPENDENCIES: - ZendeskSupportSDK (~> 5.0) SPEC REPOS: - https://github.com/wordpress-mobile/cocoapods-specs.git: - - WordPressAuthenticator trunk: - Alamofire - AppAuth @@ -125,6 +123,7 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS + - WordPressAuthenticator - WordPressKit - WordPressShared - WordPressUI @@ -162,7 +161,7 @@ SPEC CHECKSUMS: UIDeviceIdentifier: af4e11e25a2ea670078e2bd677bb0e8144f9f063 WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 - WordPressAuthenticator: cafaace4519c72caef6bf950204bf21380194894 + WordPressAuthenticator: c0bdeec612e4e80d76ac7849f89d8405c1d43654 WordPressKit: 96deb6ba37ea5eaec4ddcaa53eca04d653246152 WordPressShared: 5477f179c7fe03b5d574f91adda66f67d131827e WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac @@ -178,6 +177,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba -PODFILE CHECKSUM: 0f7a7c8c049a0c2ca072d18e289ac2889027a4f7 +PODFILE CHECKSUM: 56e66ae89d30a0b6cfc246d43c71ba38eff01e0d COCOAPODS: 1.11.3 diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 4758123d52a..510b77135ff 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,9 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +11.1 +----- + + 11.0 ----- diff --git a/WooCommerce/Resources/AppStoreStrings.pot b/WooCommerce/Resources/AppStoreStrings.pot index 504d9d40e4c..b0a57dd4127 100644 --- a/WooCommerce/Resources/AppStoreStrings.pot +++ b/WooCommerce/Resources/AppStoreStrings.pot @@ -57,9 +57,9 @@ msgctxt "app_store_promo_text" msgid "Run your store from anywhere" msgstr "" -msgctxt "v10.9-whats-new" +msgctxt "v11.0-whats-new" msgid "" -"This release includes a lot more stability fixes to help you log in much easier. You can now connect your WordPress.com account with Jetpack and access your store that much faster. We've also updated our app to support devices with iOS 15+ only. Please update your device to iOS 15 to continue to use the app.\n" +"Even though this release doesn’t have any surprising new features, we still put a lot of love into it! We fixed a few bugs and made several improvements to make your experience smoother.\n" msgstr "" #. translators: This is a promo message that will be attached on top of a screenshot in the App Store. diff --git a/WooCommerce/Resources/en.lproj/Localizable.strings b/WooCommerce/Resources/en.lproj/Localizable.strings index af85665065a..e2ef90e8b2c 100644 --- a/WooCommerce/Resources/en.lproj/Localizable.strings +++ b/WooCommerce/Resources/en.lproj/Localizable.strings @@ -346,6 +346,9 @@ which should be translated separately and considered part of this sentence. */ /* Cell text in Add / Edit product when there are no images. */ "Add a product image" = "Add a product image"; +/* Description for the option to create product manually */ +"Add a product manually." = "Add a product manually."; + /* Placeholder text in Product Purchase Note screen */ "Add a purchase note..." = "Add a purchase note..."; @@ -396,6 +399,9 @@ which should be translated separately and considered part of this sentence. */ /* Action to add downloadable file on the Product Downloadable Files screen */ "Add File" = "Add File"; +/* Title for the option to create product manually */ +"Add manually" = "Add manually"; + /* Title of the bottom sheet from the product form to add more product details. Title of the button at the bottom of the product form to add more product details. */ "Add more details" = "Add more details"; @@ -567,6 +573,9 @@ which should be translated separately and considered part of this sentence. */ /* Instructions for users with two-factor authentication enabled. */ "Almost there! Please enter the verification code from your authenticator app." = "Almost there! Please enter the verification code from your authenticator app."; +/* Subtitle for the login button on the account creation form. */ +"Already registered?" = "Already registered?"; + /* Instruction text to explain to help users type their password instead of using magic link login option. */ "Alternatively, you may enter the password for this account." = "Alternatively, you may enter the password for this account."; @@ -593,6 +602,9 @@ which should be translated separately and considered part of this sentence. */ Title of 'Amount Paid' section in the receipt */ "Amount Paid" = "Amount Paid"; +/* Account creation error when the email is already associated with an existing WP.com account. */ +"An account with this email already exists." = "An account with this email already exists."; + /* Default error message displayed when unable to close user account. */ "An error occured while closing account." = "An error occured while closing account."; @@ -831,6 +843,9 @@ which should be translated separately and considered part of this sentence. */ /* Placeholder of the text field for editing the button text for an external/affiliate product */ "Buy Product" = "Buy Product"; +/* Terms of service format on the account creation form. */ +"By continuing, you agree to our %1$@." = "By continuing, you agree to our %1$@."; + /* Legal disclaimer for logging in. The underscores _..._ denote underline. */ "By continuing, you agree to our _Terms of Service_." = "By continuing, you agree to our _Terms of Service_."; @@ -1032,6 +1047,9 @@ which should be translated separately and considered part of this sentence. */ /* Navigation title on the shipping label country selector screen */ "Choose a Country" = "Choose a Country"; +/* Title of the password field on the account creation form. */ +"Choose a password" = "Choose a password"; + /* Navigation title on the shipping label states of a country selector screen */ "Choose a State" = "Choose a State"; @@ -1356,12 +1374,21 @@ which should be translated separately and considered part of this sentence. */ /* Description for percentage discount type on the action sheet presented from Add or Edit coupon screen */ "Create a percentage discount for selected products" = "Create a percentage discount for selected products"; +/* Navigates to a new flow for site creation. */ +"Create a Site" = "Create a Site"; + /* Title of the store creation web view. */ "Create a store" = "Create a store"; +/* Button displayed on the prologue screen of the simplified login flow to create a new store */ +"Create a Store" = "Create a Store"; + /* The button title text for creating a new account. */ "Create Account" = "Create Account"; +/* Action button linking to create WooCommerce store flow.Presented when logging in with an email address that is not a WordPress.com account */ +"Create An Account" = "Create An Account"; + /* Description of the Action sheet option when the user wants to create Simple Payments order */ "Create an order with minimal information" = "Create an order with minimal information"; @@ -1795,7 +1822,8 @@ which should be translated separately and considered part of this sentence. */ /* Accessibility label for the email address text field. Placeholder for a textfield. The user may enter their email address. - Placeholder for the email address textfield. */ + Placeholder for the email address textfield. + Placeholder of the email field on the account creation form. */ "Email address" = "Email address"; /* Label for yes/no switch - emailing the note to customer. */ @@ -1926,6 +1954,9 @@ which should be translated separately and considered part of this sentence. */ /* Footer text for Downloadable Limit */ "Enter the number of time file can be downloaded or leave blank for unlimited downloads" = "Enter the number of time file can be downloaded or leave blank for unlimited downloads"; +/* Instructional text shown when requesting the user's password for WPCom login. */ +"Enter the password for your account." = "Enter the password for your account."; + /* Instructional text shown when requesting the user's password for login. */ "Enter the password for your WordPress.com account." = "Enter the password for your WordPress.com account."; @@ -1941,6 +1972,9 @@ which should be translated separately and considered part of this sentence. */ /* Enter your account information for {site url}. Asks the user to enter a username and password for their self-hosted site. */ "Enter your account information for %@." = "Enter your account information for %@."; +/* Sign in instructions on the 'log in using WordPress.com account' screen. */ +"Enter your email address to get started." = "Enter your email address to get started."; + /* Instruction text on the initial email address entry screen. */ "Enter your email address to log in or create a WordPress.com account." = "Enter your email address to log in or create a WordPress.com account."; @@ -2164,6 +2198,9 @@ which should be translated separately and considered part of this sentence. */ /* Text field name in Edit Address Form */ "First name" = "First name"; +/* Subtitle for the account creation form. */ +"First, let’s create your account." = "First, let’s create your account."; + /* Name of fixed cart discount type */ "Fixed Cart Discount" = "Fixed Cart Discount"; @@ -2216,6 +2253,12 @@ which should be translated separately and considered part of this sentence. */ View title for initial auth views. */ "Get Started" = "Get Started"; +/* Title of the submit button on the account creation form. */ +"Get started" = "Get started"; + +/* Title for the account creation form. */ +"Get started in minutes" = "Get started in minutes"; + /* Title of the Jetpack benefits banner. */ "Get the full experience with Jetpack" = "Get the full experience with Jetpack"; @@ -2343,6 +2386,9 @@ which should be translated separately and considered part of this sentence. */ /* Title on the navigation bar for the in-app feedback survey */ "How can we improve?" = "How can we improve?"; +/* Message title of bottom sheet for selecting a template or manual product */ +"How do you want to start?" = "How do you want to start?"; + /* Title of HS Tariff Number row in Package Content section in Customs screen of Shipping Label flow */ "HS Tariff Number" = "HS Tariff Number"; @@ -2683,6 +2729,9 @@ This is the link to the website, and forms part of a longer sentence which it sh /* Link that points the user to learn more about roles. Clicking will open a web page.Presented when the user has tries to switch to a store with incorrect permissions. */ "Learn more about roles and permissions" = "Learn more about roles and permissions"; +/* Title of button in the simplified login prologue screen for learning more about WooCommerce. */ +"Learn more about WooCommerce" = "Learn more about WooCommerce"; + /* Title of legal paper size option for printing a shipping label */ "Legal (8.5 x 14 in)" = "Legal (8.5 x 14 in)"; @@ -2758,11 +2807,15 @@ This is the link to the website, and forms part of a longer sentence which it sh /* Explains that the files are sorted by LIFO date: most recent day listed first. */ "Log files by created date" = "Log files by created date"; -/* Button title. Tapping takes the user to the login form. +/* Button title in the simplified login prologue screen. Takes the user to the login flow. + Button title. Tapping takes the user to the login form. Log In button label. View title during the log in process. */ "Log In" = "Log In"; +/* Title of the login button on the account creation form. */ +"Log in" = "Log in"; + /* A generic error message for a failed log in. */ "Log in failed. Please try again." = "Log in failed. Please try again."; @@ -3392,12 +3445,16 @@ This is the link to the website, and forms part of a longer sentence which it sh Login dialog password placeholder Password field title in Product Visibility Password placeholder - Placeholder for the password textfield. */ + Placeholder for the password textfield. + Placeholder of the password field on the account creation form. */ "Password" = "Password"; /* No comment provided by engineer. */ "password" = "password"; +/* Account creation error when the password is invalid. */ +"Password must be at least 6 characters." = "Password must be at least 6 characters."; + /* One of the possible options in Product Visibility */ "Password Protected" = "Password Protected"; @@ -3596,7 +3653,8 @@ This is the link to the website, and forms part of a longer sentence which it sh /* Body text for the default store picker error screen */ "Please try again or reach out to us and we'll be happy to assist you!" = "Please try again or reach out to us and we'll be happy to assist you!"; -/* The message of the alert when there is an error uploading an image */ +/* Account creation error when an unexpected error occurs. + The message of the alert when there is an error uploading an image */ "Please try again." = "Please try again."; /* Error message when Jetpack activation fails */ @@ -4225,6 +4283,9 @@ This is the link to the website, and forms part of a longer sentence which it sh /* Coupons Search Placeholder */ "Search all coupons" = "Search all coupons"; +/* Customer Search Placeholder */ +"Search all customers" = "Search all customers"; + /* Orders Search Placeholder */ "Search all orders" = "Search all orders"; @@ -4703,6 +4764,9 @@ This is the link to the website, and forms part of a longer sentence which it sh /* The details on the placeholder overlay when there are no products on the Products tab */ "Start selling today by adding your first product to the store." = "Start selling today by adding your first product to the store."; +/* Title for the option to create a template product */ +"Start with a template" = "Start with a template"; + /* VoiceOver accessibility value, informs the user about the X-axis min/max values. It reads: Starting date {date}, ending date {date}. */ "Starting period %@, ending period %@" = "Starting period %1$@, ending period %2$@"; @@ -4996,7 +5060,8 @@ This is the link to the website, and forms part of a longer sentence which it sh /* The placeholder text for the of the Aztec editor screen. */ "Tell us more about %1$@..." = "Tell us more about %1$@..."; -/* The terms to be agreed upon when tapping the Connect Jetpack button on the Wrong Account screen. +/* Terms of service link on the account creation form. + The terms to be agreed upon when tapping the Connect Jetpack button on the Wrong Account screen. Title of button that displays the App's terms of service */ "Terms of Service" = "Terms of Service"; @@ -5308,9 +5373,6 @@ This is the link to the website, and forms part of a longer sentence which it sh /* An error message informing the user the email address they entered did not match a WordPress.com account. */ "This email address is not registered on WordPress.com." = "This email address is not registered on WordPress.com."; -/* Message explaining that an email is not associated with a WordPress.com account. Presented when logging in with an email address that is not a WordPress.com account */ -"This email isn't used with a WordPress.com account." = "This email isn't used with a WordPress.com account."; - /* Error for missing package details on the Add New Custom Package screen in Shipping Label flow */ "This field is required" = "This field is required"; @@ -5508,6 +5570,9 @@ This is the link to the website, and forms part of a longer sentence which it sh Button to dismiss the alert presented when connecting to a specific reader fails. This allows the search to continue. */ "Try again" = "Try again"; +/* Action button that will restart the login flow.Presented when logging in with an email address that does not match a WordPress.com account */ +"Try Another Address" = "Try Another Address"; + /* Message from the in-person payment card reader prompting user to retry a payment using a different card */ "Try Another Card" = "Try Another Card"; @@ -5846,6 +5911,12 @@ This is the link to the website, and forms part of a longer sentence which it sh Title for the usage restrictions section on coupon usage restrictions screen */ "Usage Restrictions" = "Usage Restrictions"; +/* Description for the option to create a template product */ +"Use a template to create physical, virtual, and variable products." = "Use a template to create physical, virtual, and variable products."; + +/* Account creation error when the email is invalid. */ +"Use a working email address, so you can receive our messages." = "Use a working email address, so you can receive our messages."; + /* Action to use the address in Shipping Label Validation screen as entered */ "Use Address as Entered" = "Use Address as Entered"; @@ -6166,6 +6237,9 @@ This is the link to the website, and forms part of a longer sentence which it sh /* Subject of new Zendesk ticket. */ "WooCommerce for iOS Support" = "WooCommerce for iOS Support"; +/* Caption displayed in the simplified prologue screen */ +"WooCommerce is a customizable, open-source eCommerce platform built on WordPress." = "WooCommerce is a customizable, open-source eCommerce platform built on WordPress."; + /* Subject line for when sharing the app with others through mail or any other activity types that support contains a subject field. */ "WooCommerce Mobile App - Run your store from anywhere" = "WooCommerce Mobile App - Run your store from anywhere"; @@ -6255,6 +6329,12 @@ This is the link to the website, and forms part of a longer sentence which it sh /* Label that displays when a mandatory software update is happening */ "Your card reader software needs to be updated to collect payments. Cancelling will block your reader connection." = "Your card reader software needs to be updated to collect payments. Cancelling will block your reader connection."; +/* Title of the email field on the account creation form. */ +"Your email address" = "Your email address"; + +/* Message explaining that an email is not associated with a WordPress.com account. Presented when logging in with an email address that is not a WordPress.com account */ +"Your email isn't used with a WordPress.com account" = "Your email isn't used with a WordPress.com account"; + /* Message displayed when a coupon was successfully created */ "Your new coupon was created!" = "Your new coupon was created!"; diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt index 7ae99d8730e..e440ddf0ec4 100644 --- a/WooCommerce/Resources/release_notes.txt +++ b/WooCommerce/Resources/release_notes.txt @@ -1 +1 @@ -This release includes a lot more stability fixes to help you log in much easier. You can now connect your WordPress.com account with Jetpack and access your store that much faster. We've also updated our app to support devices with iOS 15+ only. Please update your device to iOS 15 to continue to use the app. +Even though this release doesn’t have any surprising new features, we still put a lot of love into it! We fixed a few bugs and made several improvements to make your experience smoother. diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig index fb66db4687d..6881cf5b081 100644 --- a/config/Version.Public.xcconfig +++ b/config/Version.Public.xcconfig @@ -1,7 +1,7 @@ -VERSION_SHORT=10.9 +VERSION_SHORT=11.0 // Public long version example: VERSION_LONG=1.2.0.0 -VERSION_LONG=10.9.0.1 +VERSION_LONG=11.0.0.0 // Re-map our custom version values (used by release-toolkit) to the Xcode ones MARKETING_VERSION=$VERSION_SHORT diff --git a/fastlane/Deliverfile b/fastlane/Deliverfile index ab67d944954..66f80b4ee3a 100644 --- a/fastlane/Deliverfile +++ b/fastlane/Deliverfile @@ -15,7 +15,7 @@ app_identifier 'com.automattic.woocommerce' screenshots_path './fastlane/promo_screenshots/' # Make sure to update these keys for a new version -app_version "10.9" +app_version "11.0" team_id '299112'