Skip to content

Merge the WordPressApiCache module into WordPressAPI #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crazytonyli wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Merge the WordPressApiCache module into WordPressAPI #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecf812d
Merge the WordPressApiCache module into WordPressAPI
crazytonyli Dec 4, 2025
92afccc
Update Xcode scheme name
crazytonyli Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildkite/swift-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function build_for_real_device() {
echo "--- :swift: Building for $platform device"
export NSUnbufferedIO=YES
xcodebuild -destination "generic/platform=$platform" \
-scheme WordPressAPI-Package \
-scheme WordPressAPI \
-derivedDataPath DerivedData \
-skipPackagePluginValidation \
build | xcbeautify
Expand Down
19 changes: 0 additions & 19 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ var package = Package(
name: "WordPressAPI",
targets: ["WordPressAPI"]
),
.library(
name: "WordPressApiCache",
targets: ["WordPressApiCache"]
)
],
dependencies: [
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
Expand Down Expand Up @@ -60,13 +56,6 @@ var package = Package(
.swiftLanguageMode(.v5)
]
),
.target(
name: "WordPressApiCache",
dependencies: [
.target(name: "WordPressAPIInternal")
],
path: "native/swift/Sources/wordpress-api-cache"
),
libwordpressFFI,
.testTarget(
name: "WordPressAPITests",
Expand All @@ -80,14 +69,6 @@ var package = Package(
.define("PROGRESS_REPORTING_ENABLED", .when(platforms: [.iOS, .macOS, .tvOS, .watchOS]))
]
),
.testTarget(
name: "WordPressApiCacheTests",
dependencies: [
.target(name: "WordPressApiCache"),
.target(name: "WordPressAPIInternal")
],
path: "native/swift/Tests/wordpress-api-cache"
),
.testTarget(
name: "WordPressApiCompatibilityTests",
dependencies: [
Expand Down
0 ...rdpress-api-cache/WordPressApiCache.swift → ...ces/wordpress-api/WordPressApiCache.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ss-api-cache/WordPressApiCacheTests.swift → ...ordpress-api/WordPressApiCacheTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import Testing
import WordPressApiCache
import WordPressAPI

actor Test {

Expand Down
2 changes: 1 addition & 1 deletion scripts/xcodebuild-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ echo "Runing on device: ${device_name}"
export NSUnbufferedIO=YES

xcodebuild \
-scheme WordPressAPI-Package \
-scheme WordPressAPI \
-derivedDataPath DerivedData \
-destination "id=${device_id}" \
-skipPackagePluginValidation \
Expand Down