Merge wp_com and jetpack crates into wp_api (#718)

* Merge `wp_com` & `jetpack` crates into `wp_api`

* Rename `JetpackConnectionClientError::UserConnectionFailed` field

* Fix packaging issues in the Swift wrapper

* Fix file not found error in rm command

---------

Co-authored-by: Tony Li <[email protected]>

Author: oguzkocer

.buildkite/download-xcframework.sh

@@ -6,7 +6,5 @@ echo "--- :arrow_down: Downloading xcframework"
 buildkite-agent artifact download target/libwordpressFFI.xcframework.zip . --step "xcframework"
 buildkite-agent artifact download native/swift/Sources/wordpress-api-wrapper/wp_api.swift . --step "xcframework"
 buildkite-agent artifact download native/swift/Sources/wordpress-api-wrapper/wp_localization.swift . --step "xcframework"
-buildkite-agent artifact download native/swift/Sources/wordpress-api-wrapper/wp_com.swift . --step "xcframework"
-buildkite-agent artifact download native/swift/Sources/wordpress-api-wrapper/jetpack.swift . --step "xcframework"
 unzip target/libwordpressFFI.xcframework.zip -d .
 rm target/libwordpressFFI.xcframework.zip

Cargo.lock

@@ -1,11 +1,9 @@
 [workspace]
 members = [
-  "jetpack",
   "wp_api",
   "wp_api_integration_tests",
   "wp_api_integration_tests_backend",
   "wp_cli",
-  "wp_com",
   "wp_contextual",
   "wp_derive",
   "wp_derive_request_builder",

Cargo.toml

@@ -102,8 +102,8 @@ _build-apple-%-tvos _build-apple-%-tvos-sim _build-apple-%-watchos _build-apple-
 
 # Build the library for a specific target
 _build-apple-%:
-	cargo $(CARGO_OPTS) $(cargo_config_library) build --target $* --package jetpack --profile $(CARGO_PROFILE)
-	./scripts/swift-bindings.sh target/$*/$(CARGO_PROFILE_DIRNAME)/libjetpack.a
+	cargo $(CARGO_OPTS) $(cargo_config_library) build --target $* --package wp_api --profile $(CARGO_PROFILE)
+	./scripts/swift-bindings.sh target/$*/$(CARGO_PROFILE_DIRNAME)/libwp_api.a
 
 # Build the library for one single platform, including real device and simulator.
 build-apple-platform-macos := $(addprefix _build-apple-,$(apple-platform-targets-macos))
@@ -145,11 +145,11 @@ docker-image-web:
 	docker build -t wordpress-rs-web -f wp_rs_web/Dockerfile . --progress=plain
 
 swift-linux-library:
-	cargo build --release --package jetpack
-	./scripts/swift-bindings.sh target/release/libjetpack.a
+	cargo build --release --package wp_api
+	./scripts/swift-bindings.sh target/release/libwp_api.a
 	mkdir -p target/release/libwordpressFFI-linux
 	cp target/release/swift-bindings/Headers/* target/release/libwordpressFFI-linux/
-	cp target/release/libjetpack.a target/release/libwordpressFFI-linux/
+	cp target/release/libwp_api.a target/release/libwordpressFFI-linux/
 
 swift-example-app: swift-example-app-mac swift-example-app-ios
 
@@ -166,7 +166,7 @@ test-swift-linux: docker-image-swift
 	docker run $(docker_opts_shared) -it wordpress-rs-swift make test-swift-linux-in-docker
 
 test-swift-linux-in-docker: swift-linux-library
-	swift test -Xlinker -Ltarget/release/libwordpressFFI-linux -Xlinker -ljetpack
+	swift test -Xlinker -Ltarget/release/libwordpressFFI-linux -Xlinker -lwp_api
 
 test-swift-darwin: xcframework
 	swift test

Makefile

@@ -119,7 +119,7 @@ end
 
 def xcframework_bindings_file_path
   dir = File.join(PROJECT_ROOT, 'native', 'swift', 'Sources', 'wordpress-api-wrapper')
-  %w[wp_api.swift wp_localization.swift wp_com.swift jetpack.swift]
+  %w[wp_api.swift wp_localization.swift]
     .map { |file| File.join(dir, file) }
 end
 

fastlane/Fastfile

@@ -46,6 +46,7 @@ for swift_binding in "$output_dir"/*.swift; do
     fi
 done
 
+rm -f native/swift/Sources/wordpress-api-wrapper/*.swift
 mv "$output_dir"/*.swift native/swift/Sources/wordpress-api-wrapper/
 
 header_dir="$output_dir/Headers"