From ce4d16ff369b3218aeae5e009044012ad44c2b20 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 20 Apr 2020 17:07:15 -0400 Subject: [PATCH 1/5] 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 4c19653fbeaf..f8efc9486804 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -55,9 +55,9 @@ android { if (project.hasProperty("versionName")) { versionName project.property("versionName") } else { - versionName "alpha-216" + versionName "alpha-217" } - versionCode 849 + versionCode 852 minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion @@ -84,9 +84,9 @@ android { dimension "buildType" // Only set the release version if one isn't provided if (!project.hasProperty("versionName")) { - versionName "14.6" + versionName "14.7-rc-1" } - versionCode 850 + versionCode 851 buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false" buildConfigField "boolean", "TENOR_AVAILABLE", "false" } From c9bcf31767e2a939e1da4bcf14b61356edcf6ead Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Mon, 20 Apr 2020 17:07:19 -0400 Subject: [PATCH 2/5] Update release notes. --- RELEASE-NOTES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 692943a5b082..773c8120ce1e 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,6 @@ +14.8 +----- + 14.7 ----- * Block editor: Disable ripple effect for Slider control From c993d1079dcce036083ac776422620c5e9d35565 Mon Sep 17 00:00:00 2001 From: Cameron Voell Date: Mon, 20 Apr 2020 15:01:06 -0700 Subject: [PATCH 3/5] Revert "Update media insertion to send caption information." --- .../wordpress/android/editor/GutenbergEditorFragment.java | 5 +---- libs/gutenberg-mobile | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index bacdec0213a8..893ef9ece2a0 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -833,10 +833,7 @@ public void appendMediaFiles(Map mediaList) { int mediaId = isNetworkUrl ? Integer.valueOf(mediaEntry.getValue().getMediaId()) : mediaEntry.getValue().getId(); String url = isNetworkUrl ? mediaEntry.getKey() : "file://" + mediaEntry.getKey(); - rnMediaList.add(createRNMediaUsingMimeType(mediaId, - url, - mediaEntry.getValue().getMimeType(), - mediaEntry.getValue().getCaption())); + rnMediaList.add(createRNMediaUsingMimeType(mediaId, url, mediaEntry.getValue().getMimeType())); } getGutenbergContainerFragment().appendUploadMediaFiles(rnMediaList); diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 6906be56ace3..315a213f1ae7 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 6906be56ace31186ded1df0b65b9ea34fe2aaf34 +Subproject commit 315a213f1ae70e670213d2369933d2725f4a72f4 From 9447d229456bceaa4795fb46109fd750910f5579 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 21 Apr 2020 14:35:38 -0400 Subject: [PATCH 4/5] Update FluxC version to 1.6.10 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6dd12985d4a5..ef3f30a75641 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,7 @@ ext { targetSdkVersion = 28 daggerVersion = '2.22.1' - fluxCVersion = '1.6.10-beta-2' + fluxCVersion = '1.6.10' appCompatVersion = '1.0.2' constraintLayoutVersion = '1.1.3' From dbef167a5f842be7d817404251735b7058652027 Mon Sep 17 00:00:00 2001 From: Matt Chowning Date: Tue, 21 Apr 2020 13:55:23 -0400 Subject: [PATCH 5/5] Revert "Revert "Update media insertion to send caption information."" Reverting the initial revert that was applied to the release branch because we want the change to remain on develop and this will insure that change is left when the release branch is merged back to develop. This reverts commit d30b6d0c7ce7792fc4378971b9508af9133ba604. --- .../wordpress/android/editor/GutenbergEditorFragment.java | 5 ++++- libs/gutenberg-mobile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index 893ef9ece2a0..bacdec0213a8 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -833,7 +833,10 @@ public void appendMediaFiles(Map mediaList) { int mediaId = isNetworkUrl ? Integer.valueOf(mediaEntry.getValue().getMediaId()) : mediaEntry.getValue().getId(); String url = isNetworkUrl ? mediaEntry.getKey() : "file://" + mediaEntry.getKey(); - rnMediaList.add(createRNMediaUsingMimeType(mediaId, url, mediaEntry.getValue().getMimeType())); + rnMediaList.add(createRNMediaUsingMimeType(mediaId, + url, + mediaEntry.getValue().getMimeType(), + mediaEntry.getValue().getCaption())); } getGutenbergContainerFragment().appendUploadMediaFiles(rnMediaList); diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 315a213f1ae7..6906be56ace3 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 315a213f1ae70e670213d2369933d2725f4a72f4 +Subproject commit 6906be56ace31186ded1df0b65b9ea34fe2aaf34