Merge pull request #284 from wordpress-mobile/merge/1.14.0-into-trunk

Merge 1.14.0 into trunk
wordpress-mobile · Dec 14, 2020 · db2301e · db2301e
2 parents 2c223cc + a427dbe
commit db2301e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
+    json (2.3.1)
     minitest (5.12.2)
     molinillo (0.6.6)
     nanaimo (0.2.6)

diff --git a/WordPressShared.podspec b/WordPressShared.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressShared"
-  s.version       = "1.13.0"
+  s.version       = "1.14.0"
   s.summary       = "Shared components used in building the WordPress iOS apps and other library components."
 
   s.description   = <<-DESC
@@ -25,5 +25,5 @@ Pod::Spec.new do |s|
   s.header_dir    = 'WordPressShared'
 
   s.dependency 'CocoaLumberjack', '~> 3.4'
-  s.dependency 'FormatterKit/TimeIntervalFormatter', '1.8.2'
+  s.dependency 'FormatterKit/TimeIntervalFormatter', ' ~> 1.8'
 end
diff --git a/WordPressShared/Core/Analytics/WPAnalytics.h b/WordPressShared/Core/Analytics/WPAnalytics.h
@@ -324,6 +324,7 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) {
     WPAnalyticsStatPostListTrashAction,
     WPAnalyticsStatPostListViewAction,
     WPAnalyticsStatPostListToggleButtonPressed,
+    WPAnalyticsStatPostListDuplicateAction,
     WPAnalyticsStatPostRevisionsListViewed,
     WPAnalyticsStatPostRevisionsDetailViewed,
     WPAnalyticsStatPostRevisionsDetailCancelled,