From f6b2a5e25cd3df1dee770d6c1e17d5694768dcb6 Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Fri, 15 Feb 2019 15:16:15 +0000 Subject: [PATCH 01/12] Add new function to get the date components object --- WordPressShared/Core/Utility/NSDate+Helpers.swift | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/WordPressShared/Core/Utility/NSDate+Helpers.swift b/WordPressShared/Core/Utility/NSDate+Helpers.swift index 7b8e969..25aacf3 100644 --- a/WordPressShared/Core/Utility/NSDate+Helpers.swift +++ b/WordPressShared/Core/Utility/NSDate+Helpers.swift @@ -187,6 +187,13 @@ extension Date { return DateFormatters.pageSectionFormatter.string(forTimeInterval: interval) } } + + /// Returns the date components object. + /// + public func components() -> DateComponents { + return Calendar.current.dateComponents([.year, .month, .day, .hour, .minute, .second], + from: self) + } } extension NSDate { @@ -234,4 +241,10 @@ extension NSDate { @objc public func toStringForPageSections() -> String { return (self as Date).toStringForPageSections() } + + /// Returns the date components object. + /// + @objc public func components() -> NSDateComponents { + return (self as Date).components() as NSDateComponents + } } From e595ec5e0c1b349774a65de0beeb2012c6ba25ff Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Fri, 15 Feb 2019 15:16:24 +0000 Subject: [PATCH 02/12] Add small test --- WordPressShared.xcodeproj/project.pbxproj | 4 +++ WordPressSharedTests/NSDateHelperTest.swift | 36 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 WordPressSharedTests/NSDateHelperTest.swift diff --git a/WordPressShared.xcodeproj/project.pbxproj b/WordPressShared.xcodeproj/project.pbxproj index 1feee19..1153da9 100644 --- a/WordPressShared.xcodeproj/project.pbxproj +++ b/WordPressShared.xcodeproj/project.pbxproj @@ -59,6 +59,7 @@ 93AB05FF1EE840A100EF8764 /* Languages.json in Resources */ = {isa = PBXBuildFile; fileRef = 93AB05FE1EE840A100EF8764 /* Languages.json */; }; 93C674F51EE83D4B00BFAF05 /* Languages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93C674F41EE83D4B00BFAF05 /* Languages.swift */; }; 93C882AD1EEB1E2F00227A59 /* NSDate+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93C882AC1EEB1E2F00227A59 /* NSDate+Helpers.swift */; }; + 9A1329DF22170BE2009EE02A /* NSDateHelperTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A1329DE22170BE2009EE02A /* NSDateHelperTest.swift */; }; B5393FD8206D608F007BF9D4 /* EmailFormatValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5393FD6206D608E007BF9D4 /* EmailFormatValidator.swift */; }; B5393FD9206D608F007BF9D4 /* EmailTypoChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5393FD7206D608F007BF9D4 /* EmailTypoChecker.swift */; }; B5393FDC206D6169007BF9D4 /* EmailFormatValidatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5393FDA206D6169007BF9D4 /* EmailFormatValidatorTests.swift */; }; @@ -156,6 +157,7 @@ 93AB05FE1EE840A100EF8764 /* Languages.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Languages.json; sourceTree = ""; }; 93C674F41EE83D4B00BFAF05 /* Languages.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Languages.swift; sourceTree = ""; }; 93C882AC1EEB1E2F00227A59 /* NSDate+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSDate+Helpers.swift"; sourceTree = ""; }; + 9A1329DE22170BE2009EE02A /* NSDateHelperTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSDateHelperTest.swift; sourceTree = ""; }; AE15A6EE80D7766A21B83BF5 /* Pods_WordPressShared.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WordPressShared.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B5393FD6206D608E007BF9D4 /* EmailFormatValidator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmailFormatValidator.swift; sourceTree = ""; }; B5393FD7206D608F007BF9D4 /* EmailTypoChecker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmailTypoChecker.swift; sourceTree = ""; }; @@ -304,6 +306,7 @@ isa = PBXGroup; children = ( 7414BD511F13CB90005759F8 /* DictionaryHelpersTests.swift */, + 9A1329DE22170BE2009EE02A /* NSDateHelperTest.swift */, 740B23CE1F17F28E00067A2A /* DisplayableImageHelperTest.m */, B5393FDA206D6169007BF9D4 /* EmailFormatValidatorTests.swift */, B5393FDB206D6169007BF9D4 /* EmailTypoCheckerTests.swift */, @@ -673,6 +676,7 @@ 7430C9DD1F1934190051B8E6 /* RichContentFormatterTests.swift in Sources */, B5393FDC206D6169007BF9D4 /* EmailFormatValidatorTests.swift in Sources */, 748710AC1F06C465008095AB /* StringHelperTests.swift in Sources */, + 9A1329DF22170BE2009EE02A /* NSDateHelperTest.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WordPressSharedTests/NSDateHelperTest.swift b/WordPressSharedTests/NSDateHelperTest.swift new file mode 100644 index 0000000..7f35958 --- /dev/null +++ b/WordPressSharedTests/NSDateHelperTest.swift @@ -0,0 +1,36 @@ +import Foundation +import XCTest +@testable import WordPressShared + +class NSDateHelperTest: XCTestCase { + struct Data { + let year: Int + let month: Int + let day: Int + + var dateString: String { + return "\(year)-\(month)-\(day)" + } + } + + let data = Data(year: 2019, month: 02, day: 17) + var date: Date? + var dateFormatter: DateFormatter { + let formatter = DateFormatter() + formatter.dateFormat = "yyyy-MM-dd" + return formatter + } + + override func setUp() { + date = dateFormatter.date(from: data.dateString) + } + + func testDateComponents() { + XCTAssertNotNil(date) + + let components = date!.components() + XCTAssertEqual(components.year, data.year) + XCTAssertEqual(components.month, data.month) + XCTAssertEqual(components.day, data.day) + } +} From 5c3dace9cdffb9b16dae5cb09a9e30d69fc3a2f1 Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Fri, 15 Feb 2019 15:16:35 +0000 Subject: [PATCH 03/12] Bump podspec version --- WordPressShared.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressShared.podspec b/WordPressShared.podspec index 20e5501..0ba95ef 100644 --- a/WordPressShared.podspec +++ b/WordPressShared.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressShared" - s.version = "1.7.1-beta.1" + s.version = "1.7.1-beta.2" s.summary = "Shared components used in building the WordPress iOS apps and other library components." s.description = <<-DESC From def35777c45da64ddddf012affc64a8328c01c65 Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Fri, 15 Feb 2019 18:49:09 +0000 Subject: [PATCH 04/12] Bump podspec --- WordPressShared.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressShared.podspec b/WordPressShared.podspec index 0ba95ef..2575b06 100644 --- a/WordPressShared.podspec +++ b/WordPressShared.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressShared" - s.version = "1.7.1-beta.2" + s.version = "1.7.1-beta.3" s.summary = "Shared components used in building the WordPress iOS apps and other library components." s.description = <<-DESC From 03b43c566326f8ce304f20c615455833108a1b72 Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Wed, 6 Mar 2019 14:37:44 +0000 Subject: [PATCH 05/12] Bump podspec to version beta.2 --- WordPressShared.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressShared.podspec b/WordPressShared.podspec index b2df7fe..bc48fd4 100644 --- a/WordPressShared.podspec +++ b/WordPressShared.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressShared" - s.version = "1.7.2-beta.1" + s.version = "1.7.2-beta.2" s.summary = "Shared components used in building the WordPress iOS apps and other library components." s.description = <<-DESC From ddf5d2d4dc04c8fbe35135653cda0e5df7adeabb Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Wed, 6 Mar 2019 14:42:29 +0000 Subject: [PATCH 06/12] Change method signature --- WordPressShared/Core/Utility/NSDate+Helpers.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPressShared/Core/Utility/NSDate+Helpers.swift b/WordPressShared/Core/Utility/NSDate+Helpers.swift index 25aacf3..f072a3c 100644 --- a/WordPressShared/Core/Utility/NSDate+Helpers.swift +++ b/WordPressShared/Core/Utility/NSDate+Helpers.swift @@ -190,7 +190,7 @@ extension Date { /// Returns the date components object. /// - public func components() -> DateComponents { + public func dateAndTimeComponents() -> DateComponents { return Calendar.current.dateComponents([.year, .month, .day, .hour, .minute, .second], from: self) } @@ -244,7 +244,7 @@ extension NSDate { /// Returns the date components object. /// - @objc public func components() -> NSDateComponents { - return (self as Date).components() as NSDateComponents + @objc public func dateAndTimeComponents() -> NSDateComponents { + return (self as Date).dateAndTimeComponents() as NSDateComponents } } From cb3a14efd43f6e9f9bc5208c82a567029f98aa78 Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Wed, 6 Mar 2019 14:42:39 +0000 Subject: [PATCH 07/12] Update test --- WordPressSharedTests/NSDateHelperTest.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPressSharedTests/NSDateHelperTest.swift b/WordPressSharedTests/NSDateHelperTest.swift index 7f35958..8ef3d9b 100644 --- a/WordPressSharedTests/NSDateHelperTest.swift +++ b/WordPressSharedTests/NSDateHelperTest.swift @@ -25,10 +25,10 @@ class NSDateHelperTest: XCTestCase { date = dateFormatter.date(from: data.dateString) } - func testDateComponents() { + func testDateAndTimeComponents() { XCTAssertNotNil(date) - let components = date!.components() + let components = date!.dateAndTimeComponents() XCTAssertEqual(components.year, data.year) XCTAssertEqual(components.month, data.month) XCTAssertEqual(components.day, data.day) From fd0c74c4aaff5955ea8fab0a17e6c87ffc609846 Mon Sep 17 00:00:00 2001 From: Daniele Bogo Date: Tue, 12 Mar 2019 10:20:59 +0000 Subject: [PATCH 08/12] Bump podspec version --- WordPressShared.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressShared.podspec b/WordPressShared.podspec index c552fae..f39b6c1 100644 --- a/WordPressShared.podspec +++ b/WordPressShared.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressShared" - s.version = "1.7.2" + s.version = "1.7.3-beta.1" s.summary = "Shared components used in building the WordPress iOS apps and other library components." s.description = <<-DESC From 994dd2b4e6511b6ab3e74231c48d5de1ff2d2de1 Mon Sep 17 00:00:00 2001 From: stevebaranski Date: Thu, 28 Mar 2019 10:31:46 -0700 Subject: [PATCH 09/12] Added analytics event for stats refresh chart interactions --- WordPressShared.podspec | 2 +- WordPressShared/Core/Analytics/WPAnalytics.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/WordPressShared.podspec b/WordPressShared.podspec index f39b6c1..8a3e847 100644 --- a/WordPressShared.podspec +++ b/WordPressShared.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressShared" - s.version = "1.7.3-beta.1" + s.version = "1.7.3-beta.2" s.summary = "Shared components used in building the WordPress iOS apps and other library components." s.description = <<-DESC diff --git a/WordPressShared/Core/Analytics/WPAnalytics.h b/WordPressShared/Core/Analytics/WPAnalytics.h index 560a16b..88b77c7 100644 --- a/WordPressShared/Core/Analytics/WPAnalytics.h +++ b/WordPressShared/Core/Analytics/WPAnalytics.h @@ -456,6 +456,7 @@ typedef NS_ENUM(NSUInteger, WPAnalyticsStat) { WPAnalyticsStatSkippedConnectingToJetpack, WPAnalyticsStatStatsAccessed, WPAnalyticsStatStatsInsightsAccessed, + WPAnalyticsStatStatsOverviewBarChartTapped, WPAnalyticsStatStatsPeriodDaysAccessed, WPAnalyticsStatStatsPeriodWeeksAccessed, WPAnalyticsStatStatsPeriodMonthsAccessed, From 987f50dbfc77f416a540f6e0fdb640472e8f5bda Mon Sep 17 00:00:00 2001 From: James Treanor Date: Mon, 8 Apr 2019 12:27:51 +0100 Subject: [PATCH 10/12] Update CocoaPods --- Gemfile | 2 +- Gemfile.lock | 32 +++++++++++------------ Podfile | 26 +++++++++++------- Podfile.lock | 4 +-- WordPressShared.xcodeproj/project.pbxproj | 12 ++++----- 5 files changed, 41 insertions(+), 35 deletions(-) diff --git a/Gemfile b/Gemfile index 192bc4a..427d2bd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' do - gem 'cocoapods', '1.5.3' + gem 'cocoapods', '1.6.1' gem 'xcpretty' end diff --git a/Gemfile.lock b/Gemfile.lock index 87a7de0..78c85e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,37 +2,37 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.3) + cocoapods (1.6.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.3) + cocoapods-core (= 1.6.1) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.3) + ruby-macho (~> 1.4) + xcodeproj (>= 1.8.1, < 2.0) + cocoapods-core (1.6.1) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.2) + cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap @@ -43,9 +43,9 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) @@ -56,11 +56,11 @@ GEM nap (1.1.0) netrc (0.11.0) rouge (2.0.7) - ruby-macho (1.3.1) + ruby-macho (1.4.0) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.8.0) + xcodeproj (1.8.2) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -73,7 +73,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.5.3)! + cocoapods (= 1.6.1)! xcpretty! BUNDLED WITH diff --git a/Podfile b/Podfile index b1af25d..6435777 100644 --- a/Podfile +++ b/Podfile @@ -5,19 +5,25 @@ use_frameworks! platform :ios, '10.0' +def wordpress_shared_pods + pod 'CocoaLumberjack', '~> 3.4' + pod 'FormatterKit/TimeIntervalFormatter', '1.8.2' +end + target 'WordPressShared' do project 'WordPressShared.xcodeproj' - pod 'CocoaLumberjack', '~> 3.4' - pod 'FormatterKit/TimeIntervalFormatter', '1.8.2' + wordpress_shared_pods +end + +target 'WordPressSharedTests' do + project 'WordPressShared.xcodeproj' - target 'WordPressSharedTests' do - inherit! :search_paths + wordpress_shared_pods - pod 'OHHTTPStubs', '6.1.0' - pod 'OHHTTPStubs/Swift', '6.1.0' - pod 'OCMock', '~> 3.4' - pod 'Specta', '1.0.7' - pod 'Expecta', '1.0.6' - end + pod 'OHHTTPStubs', '6.1.0' + pod 'OHHTTPStubs/Swift', '6.1.0' + pod 'OCMock', '~> 3.4' + pod 'Specta', '1.0.7' + pod 'Expecta', '1.0.6' end diff --git a/Podfile.lock b/Podfile.lock index 05c9098..fe589b3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -53,6 +53,6 @@ SPEC CHECKSUMS: OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 -PODFILE CHECKSUM: eb829a687e5e6f6e8da92abc9dbeb35b90e32550 +PODFILE CHECKSUM: b36a5bbbbea55b426f8ec1497b35819126dfa30e -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.1 diff --git a/WordPressShared.xcodeproj/project.pbxproj b/WordPressShared.xcodeproj/project.pbxproj index 1153da9..0aaccd1 100644 --- a/WordPressShared.xcodeproj/project.pbxproj +++ b/WordPressShared.xcodeproj/project.pbxproj @@ -595,26 +595,26 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-WordPressSharedTests/Pods-WordPressSharedTests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-WordPressSharedTests/Pods-WordPressSharedTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", + "${BUILT_PRODUCTS_DIR}/FormatterKit/FormatterKit.framework", "${BUILT_PRODUCTS_DIR}/Expecta/Expecta.framework", "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", "${BUILT_PRODUCTS_DIR}/OHHTTPStubs/OHHTTPStubs.framework", "${BUILT_PRODUCTS_DIR}/Specta/Specta.framework", - "${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework", - "${BUILT_PRODUCTS_DIR}/FormatterKit/FormatterKit.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FormatterKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Expecta.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHHTTPStubs.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Specta.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FormatterKit.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPressSharedTests/Pods-WordPressSharedTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WordPressSharedTests/Pods-WordPressSharedTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ From 1e211368fd9807bf114de93edde165a7d17d241a Mon Sep 17 00:00:00 2001 From: James Treanor Date: Mon, 8 Apr 2019 12:27:54 +0100 Subject: [PATCH 11/12] Update version to 1.7.3 --- WordPressShared.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPressShared.podspec b/WordPressShared.podspec index 8a3e847..6f06e74 100644 --- a/WordPressShared.podspec +++ b/WordPressShared.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "WordPressShared" - s.version = "1.7.3-beta.2" + s.version = "1.7.3" s.summary = "Shared components used in building the WordPress iOS apps and other library components." s.description = <<-DESC From 03f2e3edaa709aa3b08d59f12300a6c655c36464 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Mon, 8 Apr 2019 12:30:20 +0100 Subject: [PATCH 12/12] Update CircleCI config --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 624fbab..9bf500b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,16 +2,19 @@ version: 2.1 orbs: # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs - ios: wordpress-mobile/ios@0.0.13 + ios: wordpress-mobile/ios@0.0.24 workflows: test_and_validate: jobs: - ios/test: name: Test + xcode-version: "10.1.0" workspace: WordPressShared.xcworkspace scheme: WordPressShared - destination: "platform=iOS Simulator,name=iPhone XS,OS=latest" + device: iPhone XS + ios-version: "12.1" - ios/validate-podspec: name: Validate Podspec + xcode-version: "10.1.0" podspec-path: WordPressShared.podspec