From cfa7d9c7ee74290f9c774076940eff71dad45891 Mon Sep 17 00:00:00 2001 From: Jeremy Massel Date: Mon, 10 Feb 2020 15:29:06 -0700 Subject: [PATCH 1/4] 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 c7336a751883..e9dfcd417956 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-207" + versionName "alpha-208" } - versionCode 825 + versionCode 828 minSdkVersion 21 targetSdkVersion 28 @@ -84,9 +84,9 @@ android { dimension "buildType" // Only set the release version if one isn't provided if (!project.hasProperty("versionName")) { - versionName "14.1" + versionName "14.2-rc-1" } - versionCode 826 + versionCode 827 buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false" } From 04c3838571bc3b60fe166e364fb983e9ff3bf723 Mon Sep 17 00:00:00 2001 From: Jeremy Massel Date: Mon, 10 Feb 2020 15:29:10 -0700 Subject: [PATCH 2/4] Update release notes. --- RELEASE-NOTES.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index dcc373a67016..f9a8c79833f5 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,6 @@ +14.3 +----- + 14.2 ----- * Block editor: Long-press Inserter icon to show options to add before/after From ab7eb3d2097376b252fd93ee067355a5dc4d05c3 Mon Sep 17 00:00:00 2001 From: Jeremy Massel Date: Mon, 10 Feb 2020 15:32:54 -0700 Subject: [PATCH 3/4] Updated Strings as part of code freeze --- WordPress/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 93891e2b85d6..0e91aa98892f 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - + WordPress @@ -885,7 +885,7 @@ Item collapsed %1$s: %2$s, %3$s: %4$s %1$s, %2$d %3$s -   & %1$d %2$s +   & %1$d %2$s low medium From d8e4a34ccc7b2a3a5001ddfc93b7ab52821f9b05 Mon Sep 17 00:00:00 2001 From: Jeremy Massel Date: Mon, 10 Feb 2020 15:43:18 -0700 Subject: [PATCH 4/4] Update FluxC to 1.6.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dce141fd173e..f27951b30876 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ buildScan { ext { daggerVersion = '2.22.1' - fluxCVersion = '1.6.1.1' + fluxCVersion = '1.6.3' } // Onboarding and dev env setup tasks