Skip to content

Commit 0931ec7

Browse files
zifeozifeo
committed
cleanup
1 parent 56f6d12 commit 0931ec7

File tree

8 files changed

+13
-61
lines changed

8 files changed

+13
-61
lines changed

‎.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ rustflags = [
9696
"-C", "link-arg=-mwatchsimulator-version-min=7.0",
9797
]
9898

99-
[target.x86_64-apple-watchos]
99+
[target.x86_64-apple-watchos-sim]
100100
rustflags = [
101101
"-C", "link-arg=-mwatchos-version-min=7.0",
102102
]

‎.github/workflows/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
x86_64-apple-ios \
2525
aarch64-apple-watchos \
2626
aarch64-apple-watchos-sim \
27-
x86_64-apple-watchos
27+
x86_64-apple-watchos-sim
2828
- name: setup-cocoapods
2929
uses: maxim-lobanov/setup-cocoapods@v1
3030
with:

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
x86_64-apple-ios \
9595
aarch64-apple-watchos \
9696
aarch64-apple-watchos-sim \
97-
x86_64-apple-watchos
97+
x86_64-apple-watchos-sim
9898
- name: setup-cocoapods
9999
uses: maxim-lobanov/setup-cocoapods@v1
100100
with:

‎crates/shell/Cargo.toml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,12 @@ license.workspace = true
88
authors.workspace = true
99
keywords.workspace = true
1010

11-
[lib]
12-
name = "powersync_sqlite"
13-
path = "src/main.rs"
14-
crate-type = ["staticlib"]
15-
16-
[[bin]]
17-
name = "powersync_sqlite"
18-
path = "src/main.rs"
19-
required-features = ["shell"]
20-
2111
[dependencies]
22-
powersync_core = { path="../core", default-features = false, features = ["static", "omit_load_extension"] }
23-
sqlite_nostd = { workspace=true, features = ["static", "omit_load_extension"] }
12+
powersync_core = { path="../core" }
13+
sqlite_nostd = { workspace=true }
2414

2515
[features]
26-
default = []
27-
shell = []
16+
default = ["powersync_core/static", "powersync_core/omit_load_extension", "sqlite_nostd/static", "sqlite_nostd/omit_load_extension"]
2817

2918
[build-dependencies]
3019
cc = "1.0.46"

‎crates/sqlite/Cargo.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,9 @@ license.workspace = true
88
authors.workspace = true
99
keywords.workspace = true
1010

11-
[lib]
12-
name = "sqlite3"
13-
path = "src/main.rs"
14-
crate-type = ["staticlib"]
15-
16-
[[bin]]
17-
name = "sqlite3"
18-
path = "src/main.rs"
19-
required-features = ["shell"]
20-
2111
[dependencies]
2212

2313
[features]
24-
default = []
25-
shell = []
2614

2715
[build-dependencies]
2816
cc = "1.0.46"

‎powersync-sqlite-core.podspec

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,4 @@ PowerSync extension for SQLite.
1616
s.ios.deployment_target = '11.0'
1717
s.osx.deployment_target = '10.13'
1818
s.watchos.deployment_target = '7.0'
19-
20-
# Ensure no asset catalogs are included for watchOS
21-
s.watchos.resource_bundles = {}
22-
s.watchos.resources = []
2319
end

‎sqlite-rs-embedded

‎tool/build_xcframework.sh

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -114,28 +114,22 @@ EOF
114114
echo "===================== create watchos device framework ====================="
115115
mkdir -p "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Versions/A/Resources"
116116
echo "${watchos_plist}" >"${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Versions/A/Resources/Info.plist"
117-
cp -f "./target/aarch64-apple-watchos/release_apple/libpowersync.dylib" "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core"
118-
install_name_tool -id "@rpath/powersync-sqlite-core.framework/powersync-sqlite-core" "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core"
117+
cp -f "./target/aarch64-apple-watchos/release_apple/libpowersync.a" "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core"
119118
ln -sf A "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Versions/Current"
120119
ln -sf Versions/Current/powersync-sqlite-core "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/powersync-sqlite-core"
121120
ln -sf Versions/Current/Resources "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Resources"
122-
# Generate dSYM for watchOS device
123-
dsymutil "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core" -o "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework.dSYM"
124121

125122
echo "===================== create watchos simulator framework ====================="
126123
mkdir -p "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Versions/A/Resources"
127124
echo "${watchos_plist}" >"${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Versions/A/Resources/Info.plist"
128-
cp -f "./target/aarch64-apple-watchos-sim/release_apple/libpowersync.dylib" "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core"
129-
install_name_tool -id "@rpath/powersync-sqlite-core.framework/powersync-sqlite-core" "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core"
125+
lipo ./target/aarch64-apple-watchos-sim/release_apple/libpowersync.a ./target/x86_64-apple-watchos-sim/release_apple/libpowersync.a -create -output "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core"
130126
ln -sf A "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Versions/Current"
131127
ln -sf Versions/Current/powersync-sqlite-core "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/powersync-sqlite-core"
132128
ln -sf Versions/Current/Resources "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Resources"
133-
# Generate dSYM for watchOS simulator
134-
dsymutil "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/Versions/A/powersync-sqlite-core" -o "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework.dSYM"
135129

136130
echo "===================== create xcframework ====================="
137131
rm -rf "${BUILD_DIR}/powersync-sqlite-core.xcframework"
138-
# Create iOS/macOS XCFramework
132+
139133
xcodebuild -create-xcframework \
140134
-framework "${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework" \
141135
-debug-symbols "$(pwd -P)/${BUILD_DIR}/ios-arm64/powersync-sqlite-core.framework.dSYM" \
@@ -145,17 +139,9 @@ EOF
145139
-debug-symbols "$(pwd -P)/${BUILD_DIR}/macos-arm64_x86_64/powersync-sqlite-core.framework.dSYM" \
146140
-output "${BUILD_DIR}/powersync-sqlite-core.xcframework"
147141

148-
# Create watchOS XCFramework
149-
xcodebuild -create-xcframework \
150-
-framework "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework" \
151-
-framework "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework" \
152-
-output "${BUILD_DIR}/powersync-sqlite-core-watchos.xcframework"
153-
154-
# Copy the iOS/macOS XCFramework to the final location
155-
cp -Rf "${BUILD_DIR}/powersync-sqlite-core.xcframework" "powersync-sqlite-core.xcframework"
142+
# how to create a watchOS XCFramework with static libraries, possible?
156143

157-
# Create a zip file with both XCFrameworks
158-
zip -r --symlinks powersync-sqlite-core.xcframework.zip powersync-sqlite-core.xcframework powersync-sqlite-core-watchos.xcframework LICENSE README.md
144+
zip -r --symlinks powersync-sqlite-core.xcframework.zip powersync-sqlite-core.xcframework "${BUILD_DIR}/watchos-arm64/powersync-sqlite-core.framework/libpowersync.a" "${BUILD_DIR}/watchos-arm64-simulator/powersync-sqlite-core.framework/libpowersync.a" LICENSE README.md
159145
rm -rf ${BUILD_DIR}
160146
}
161147

@@ -173,15 +159,8 @@ cargo build -p powersync_loadable --profile release_apple --target x86_64-apple-
173159
cargo build -p powersync_loadable --profile release_apple --target aarch64-apple-darwin -Zbuild-std
174160
cargo build -p powersync_loadable --profile release_apple --target x86_64-apple-darwin -Zbuild-std
175161
# watchOS
176-
export SDKROOT=$(xcrun --sdk watchos --show-sdk-path)
177-
export CARGO_TARGET_AARCH64_APPLE_WATCHOS_LINKER=$(xcrun --sdk watchos --find clang)
178-
export CARGO_TARGET_AARCH64_APPLE_WATCHOS_AR=$(xcrun --sdk watchos --find ar)
179-
export CARGO_TARGET_AARCH64_APPLE_WATCHOS_RANLIB=$(xcrun --sdk watchos --find ranlib)
180162
cargo build -p powersync_loadable --profile release_apple -Zbuild-std=std,panic_abort --target aarch64-apple-watchos
181-
export SDKROOT=$(xcrun --sdk watchsimulator --show-sdk-path)
182-
export CARGO_TARGET_AARCH64_APPLE_WATCHOS_SIM_LINKER=$(xcrun --sdk watchsimulator --find clang)
183-
export CARGO_TARGET_AARCH64_APPLE_WATCHOS_SIM_AR=$(xcrun --sdk watchsimulator --find ar)
184-
export CARGO_TARGET_AARCH64_APPLE_WATCHOS_SIM_RANLIB=$(xcrun --sdk watchsimulator --find ranlib)
185163
cargo build -p powersync_loadable --profile release_apple -Zbuild-std=std,panic_abort --target aarch64-apple-watchos-sim
164+
cargo build -p powersync_loadable --profile release_apple -Zbuild-std=std,panic_abort --target x86_64-apple-watchos-sim
186165

187166
createXcframework

0 commit comments

Comments
 (0)