From 39f6f047956b8fc652615f66c72a286973537922 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 22 Mar 2024 17:41:54 +1100 Subject: [PATCH 1/3] Address a string interpolation warning --- Tests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift index a70f3b7e..94bfa3b2 100644 --- a/Tests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift +++ b/Tests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift @@ -327,7 +327,7 @@ class PlanServiceRemoteTests: RemoteTestCase, RESTTestable { case .failure(PlanServiceRemoteError.noMetadata): XCTAssertTrue(true) default: - XCTFail("Unexpected result: \(result)") + XCTFail("Unexpected result: \(String(describing: result))") } } } From 6cae6d5c6c5abe7bb8f948a03b29a8a45c9a1a17 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 22 Mar 2024 17:44:17 +1100 Subject: [PATCH 2/3] Remove two JSON files from "Compiled Sources" in WordPressKitTests JSON files are resources, not sources to compile. --- WordPressKit.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/WordPressKit.xcodeproj/project.pbxproj b/WordPressKit.xcodeproj/project.pbxproj index a32c7903..dd253f6f 100644 --- a/WordPressKit.xcodeproj/project.pbxproj +++ b/WordPressKit.xcodeproj/project.pbxproj @@ -7,9 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 01438D352B6A2B2C0097D60A /* stats-visits-month-unit-week.json in Sources */ = {isa = PBXBuildFile; fileRef = 01438D342B6A2B2C0097D60A /* stats-visits-month-unit-week.json */; }; 01438D362B6A31540097D60A /* stats-visits-month-unit-week.json in Resources */ = {isa = PBXBuildFile; fileRef = 01438D342B6A2B2C0097D60A /* stats-visits-month-unit-week.json */; }; - 01438D382B6A35FB0097D60A /* stats-summary.json in Sources */ = {isa = PBXBuildFile; fileRef = 01438D372B6A35FB0097D60A /* stats-summary.json */; }; 01438D392B6A361B0097D60A /* stats-summary.json in Resources */ = {isa = PBXBuildFile; fileRef = 01438D372B6A35FB0097D60A /* stats-summary.json */; }; 01438D3B2B6A36BF0097D60A /* StatsTotalsSummaryData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01438D3A2B6A36BF0097D60A /* StatsTotalsSummaryData.swift */; }; 0152100C28EDA9E400DD6783 /* StatsAnnualAndMostPopularTimeInsightDecodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0152100B28EDA9E400DD6783 /* StatsAnnualAndMostPopularTimeInsightDecodingTests.swift */; }; @@ -3435,7 +3433,6 @@ 3FFCC0412BA995290051D229 /* Date+WordPressComTests.swift in Sources */, 3F8308A729EE683500354497 /* ActivityTests.swift in Sources */, 9AB6D64A218727D60008F274 /* PostServiceRemoteRESTRevisionsTest.swift in Sources */, - 01438D382B6A35FB0097D60A /* stats-summary.json in Sources */, 7430C9BD1F192C0F0051B8E6 /* ReaderPostServiceRemoteTests.m in Sources */, 1DC837C229B9F04F009DCD4B /* RemoteVideoPressVideoTests.swift in Sources */, 3FFCC04D2BABA6980051D229 /* NSDate+WordPressComTests.swift in Sources */, @@ -3466,7 +3463,6 @@ C738CAEF28622325001BE107 /* QRLoginServiceRemoteTests.swift in Sources */, 4A05E79C2B2FDC6100C25E3B /* WordPressOrgAPITests.swift in Sources */, 3297E1DE2564653A00287D21 /* JetpackScanServiceRemoteTests.swift in Sources */, - 01438D352B6A2B2C0097D60A /* stats-visits-month-unit-week.json in Sources */, 3FFCC04B2BABA5220051D229 /* DateFormatter+WordPressComTests.swift in Sources */, 9F3E0BAC20873785009CB5BA /* ServiceRequestTest.swift in Sources */, 4624223E2548C26D002B8A12 /* SiteDesignServiceRemoteTests.swift in Sources */, From 40e63336acfa23d5972d2a1d6926a9e7db601935 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 22 Mar 2024 17:57:32 +1100 Subject: [PATCH 3/3] Convert one `@import Foundation` to `#import ` Xcode complained that kind of import (for Foundation?) was not recommended. --- Sources/WordPressKit/Services/WordPressComServiceRemote.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/WordPressKit/Services/WordPressComServiceRemote.h b/Sources/WordPressKit/Services/WordPressComServiceRemote.h index 54de9450..d4b51c87 100644 --- a/Sources/WordPressKit/Services/WordPressComServiceRemote.h +++ b/Sources/WordPressKit/Services/WordPressComServiceRemote.h @@ -1,4 +1,4 @@ -@import Foundation; +#import #import typedef NS_ENUM(NSUInteger, WordPressComServiceBlogVisibility) {