From 927cfadb118eb94bcdc0ac4c5662783af1871a3e Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 12 May 2020 14:32:03 -0400 Subject: [PATCH 1/2] Bump version number --- WordPress/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 545bbb45974f..4aa6a585b485 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -84,9 +84,9 @@ android { dimension "buildType" // Only set the release version if one isn't provided if (!project.hasProperty("versionName")) { - versionName "14.7" + versionName "14.7.1" } - versionCode 858 + versionCode 863 buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false" buildConfigField "boolean", "TENOR_AVAILABLE", "false" } From 3a381047fb5e6896709fe4eb863fb3391743bb91 Mon Sep 17 00:00:00 2001 From: Klymentiy haykov Date: Fri, 8 May 2020 16:14:44 -0700 Subject: [PATCH 2/2] When upgrading from older version do not go through update script steps. --- .../java/org/wordpress/android/datasets/ReaderDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java index 4bd6f3f06020..2c3a2c00bc14 100644 --- a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java +++ b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java @@ -176,7 +176,7 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { if (currentVersion <= DB_LAST_VERSION_WITHOUT_MIGRATION_SCRIPT) { // versions 0 - 136 didn't support migration scripts, so we can safely drop and recreate all tables reset(db); - currentVersion = DB_LAST_VERSION_WITHOUT_MIGRATION_SCRIPT; + currentVersion = newVersion; } switch (currentVersion) {