Skip to content

Merge hotfix 17.7.1 into release 17.8 #16883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mokagio merged 15 commits into from
Jul 20, 2021
Merged

Merge hotfix 17.7.1 into release 17.8 #16883

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b2178c0
Ensure the value returned by Blog.version is a string
Jul 16, 2021
3abc5b5
Temporarily switch to WIP branch to complete the hotfix creation process
mokagio Jul 16, 2021
f6fbd0e
Skip Deliverfile update when creating new hotfix
mokagio Jul 16, 2021
6799976
Bump version number
mokagio Jul 16, 2021
556aabc
Revert changes made to complete hotfix lane
mokagio Jul 16, 2021
f134da9
Fix Xcode warnings
Jul 16, 2021
d230e83
Expose BlogBuilder.set publically
Jul 16, 2021
ea8b3e3
Add Blog.version string conversion testing
Jul 16, 2021
741d128
Add a third test case when Blog.version is not convertible to a string
Jul 16, 2021
7e1200f
Update Blog.version tests to validate the returned value
Jul 16, 2021
cde9449
Merge pull request #16877 from wordpress-mobile/issue/fix-swift-versi…
Jul 16, 2021
681b06a
Merge hotfix 17.7.1 into release 17.8 branch
mokagio Jul 19, 2021
de1c5ad
Fix BlockEditorSettingService tests
chipsnyder Jul 19, 2021
94c2d2c
Replace "colors" with "gradients" in XCTFail message referring to gra…
mokagio Jul 20, 2021
9980088
Update blog creation in BlockEditorSettingService to fix tests (#16888)
mokagio Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump version number
  • Loading branch information
@mokagio
mokagio committed Jul 16, 2021
commit 6799976355d49e2d01acc59549ec5dc762a194d6
4 changes: 2 additions & 2 deletions config/Version.internal.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_SHORT=17.7
VERSION_SHORT=17.7.1

// Internal long version example: VERSION_LONG=9.9.0.20180423
VERSION_LONG=17.7.0.20210709
VERSION_LONG=17.7.1.20210716
4 changes: 2 additions & 2 deletions config/Version.public.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_SHORT=17.7
VERSION_SHORT=17.7.1

// Public long version example: VERSION_LONG=9.9.0.0
VERSION_LONG=17.7.0.4
VERSION_LONG=17.7.1.0