Skip to content

Commit b2901bd

Browse files
authored
Merge pull request #8375 from woocommerce/release/11.6
Merge 11.6 code freeze to trunk
2 parents c74e60b + e2c4629 commit b2901bd

File tree

8 files changed

+130
-20
lines changed

8 files changed

+130
-20
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ target 'WooCommerce' do
7676
# pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
7777
# pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
7878

79-
pod 'WordPressShared', '~> 2.0-beta'
79+
pod 'WordPressShared', '~> 2.0'
8080

8181
pod 'WordPressUI', '~> 1.12.5'
8282
# pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => ''

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ PODS:
5353
- UIDeviceIdentifier (~> 2.0)
5454
- WordPressShared (~> 2.0-beta)
5555
- wpxmlrpc (~> 0.9)
56-
- WordPressShared (2.0.0-beta.2)
56+
- WordPressShared (2.0.0)
5757
- WordPressUI (1.12.5)
5858
- Wormholy (1.6.5)
5959
- WPMediaPicker (1.8.1)
@@ -86,7 +86,7 @@ DEPENDENCIES:
8686
- WordPress-Editor-iOS (~> 1.11.0)
8787
- WordPressAuthenticator (~> 5.0.0)
8888
- WordPressKit (~> 5.0.0)
89-
- WordPressShared (~> 2.0-beta)
89+
- WordPressShared (~> 2.0)
9090
- WordPressUI (~> 1.12.5)
9191
- Wormholy (~> 1.6.5)
9292
- WPMediaPicker (~> 1.8.1)
@@ -155,7 +155,7 @@ SPEC CHECKSUMS:
155155
WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81
156156
WordPressAuthenticator: 0cdf1bff75bd3f58fe733d6457221f27bbbdc9f4
157157
WordPressKit: 202f529323b079a344f7bc1493b7ebebfd9ed4b5
158-
WordPressShared: 04403b43f821c4ed2b84a2112ef9f64f1e7cdceb
158+
WordPressShared: 35d41bdf0927e714af1fc85fa9cb692f934473be
159159
WordPressUI: c5be816f6c7b3392224ac21de9e521e89fa108ac
160160
Wormholy: 3252bc3e55a1847ef9a0976c1377bd77bf3635fa
161161
WPMediaPicker: 9011a0ec1f468c039af7485c244576b4c9889a0f
@@ -169,6 +169,6 @@ SPEC CHECKSUMS:
169169
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
170170
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
171171

172-
PODFILE CHECKSUM: 163bea8d6c3d10366ec3df45e35730da367abaa8
172+
PODFILE CHECKSUM: cc3c6d9d046f232dba2b1be5dad549543da973bd
173173

174174
COCOAPODS: 1.11.3

RELEASE-NOTES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
22

3+
11.7
4+
-----
5+
6+
37
11.6
48
-----
59
- [***] We added a new Analytics Hub inside the My Store area of the app. Simply click on the See More button under the store stats to check more detailed information on Revenue, Orders and Products. [https://github.com/woocommerce/woocommerce-ios/pull/8356]

WooCommerce/Resources/AppStoreStrings.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ msgctxt "app_store_promo_text"
5757
msgid "Run your store from anywhere"
5858
msgstr ""
5959

60-
msgctxt "v11.5-whats-new"
60+
msgctxt "v11.6-whats-new"
6161
msgid ""
62-
"This release includes a few bug fixes and improvements to make your experience smoother. Stay tuned for exciting updates in the coming weeks!\n"
62+
"Good news! We added a new analytics section to the app! Simply click on the See More button under the store stats to check more detailed information on Revenue and Orders. This isn’t the last of it – more updates to come in the next few weeks!\n"
6363
msgstr ""
6464

6565
#. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

WooCommerce/Resources/en.lproj/Localizable.strings

Lines changed: 115 additions & 9 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
This release includes a few bug fixes and improvements to make your experience smoother. Stay tuned for exciting updates in the coming weeks!
1+
Good news! We added a new analytics section to the app! Simply click on the See More button under the store stats to check more detailed information on Revenue and Orders. This isn’t the last of it – more updates to come in the next few weeks!

config/Version.Public.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
VERSION_SHORT=11.5
1+
VERSION_SHORT=11.6
22

33
// Public long version example: VERSION_LONG=1.2.0.0
4-
VERSION_LONG=11.5.0.1
4+
VERSION_LONG=11.6.0.0
55

66
// Re-map our custom version values (used by release-toolkit) to the Xcode ones
77
MARKETING_VERSION=$VERSION_SHORT

fastlane/Deliverfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ app_identifier 'com.automattic.woocommerce'
1515
screenshots_path './fastlane/promo_screenshots/'
1616

1717
# Make sure to update these keys for a new version
18-
app_version "11.5"
18+
app_version "11.6"
1919

2020
team_id '299112'
2121

0 commit comments

Comments
 (0)