diff --git a/cinterop-c/.bazelrc b/cinterop-c/.bazelrc index 8f27c1876..a859893f5 100644 --- a/cinterop-c/.bazelrc +++ b/cinterop-c/.bazelrc @@ -4,9 +4,20 @@ build:release --compilation_mode=opt --strip=always build:macos_arm64 --platforms=@build_bazel_apple_support//platforms:macos_arm64 --apple_platform_type=macos build:macos_x64 --platforms=@build_bazel_apple_support//platforms:macos_x86_64 --apple_platform_type=macos + build:ios_arm64 --platforms=@build_bazel_apple_support//platforms:ios_arm64 --apple_platform_type=ios build:ios_simulator_arm64 --platforms=@build_bazel_apple_support//platforms:ios_sim_arm64 --apple_platform_type=ios build:ios_x64 --platforms=@build_bazel_apple_support//platforms:ios_x86_64 --apple_platform_type=ios +build:watchos_arm64 --platforms=@build_bazel_apple_support//platforms:watchos_arm64_32 --apple_platform_type=watchos +build:watchos_device_arm64 --platforms=@build_bazel_apple_support//platforms:watchos_device_arm64 --apple_platform_type=watchos +build:watchos_simulator_arm64 --platforms=@build_bazel_apple_support//platforms:watchos_arm64 --apple_platform_type=watchos +build:watchos_arm32 --platforms=@build_bazel_apple_support//platforms:watchos_armv7k --apple_platform_type=watchos +build:watchos_x64 --platforms=@build_bazel_apple_support//platforms:watchos_x86_64 --apple_platform_type=watchos + +build:tvos_arm64 --platforms=@build_bazel_apple_support//platforms:tvos_arm64 --apple_platform_type=watchos +build:tvos_simulator_arm64 --platforms=@build_bazel_apple_support//platforms:tvos_sim_arm64 --apple_platform_type=watchos +build:tvos_x64 --platforms=@build_bazel_apple_support//platforms:tvos_x86_64 --apple_platform_type=watchos + build:linux_arm64 --platforms=//platforms:linux_arm64 build:linux_x64 --platforms=//platforms:linux_x86_64 diff --git a/cinterop-c/MODULE.bazel b/cinterop-c/MODULE.bazel index 962279775..de066efef 100644 --- a/cinterop-c/MODULE.bazel +++ b/cinterop-c/MODULE.bazel @@ -7,7 +7,7 @@ module( bazel_dep(name = "rules_cc", version = "0.2.0") # required to build for apple targets (like iOS) -bazel_dep(name = "apple_support", version = "1.22.1", repo_name = "build_bazel_apple_support") +bazel_dep(name = "apple_support", version = "1.24.5", repo_name = "build_bazel_apple_support") bazel_dep(name = "platforms", version = "1.0.0") # Protobuf diff --git a/cinterop-c/MODULE.bazel.lock b/cinterop-c/MODULE.bazel.lock index 5f6a4c808..7205e847a 100644 --- a/cinterop-c/MODULE.bazel.lock +++ b/cinterop-c/MODULE.bazel.lock @@ -22,9 +22,9 @@ "https://bcr.bazel.build/modules/apple_support/1.13.0/MODULE.bazel": "7c8cdea7e031b7f9f67f0b497adf6d2c6a2675e9304ca93a9af6ed84eef5a524", "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85", "https://bcr.bazel.build/modules/apple_support/1.17.1/MODULE.bazel": "655c922ab1209978a94ef6ca7d9d43e940cd97d9c172fb55f94d91ac53f8610b", - "https://bcr.bazel.build/modules/apple_support/1.22.1/MODULE.bazel": "90bd1a660590f3ceffbdf524e37483094b29352d85317060b2327fff8f3f4458", "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442", - "https://bcr.bazel.build/modules/apple_support/1.23.1/source.json": "d888b44312eb0ad2c21a91d026753f330caa48a25c9b2102fae75eb2b0dcfdd2", + "https://bcr.bazel.build/modules/apple_support/1.24.5/MODULE.bazel": "692784f32ee3175cc1ced78f4262a0d4b7110c89793cd0b63f950af2d9cc6bdc", + "https://bcr.bazel.build/modules/apple_support/1.24.5/source.json": "e81e4f6557a879aaaa104e84255710a02862b9380b12bd72e4a58bff32c70116", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.31.2/MODULE.bazel": "7bee702b4862612f29333590f4b658a5832d433d6f8e4395f090e8f4e85d442f", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.38.0/MODULE.bazel": "6307fec451ba9962c1c969eb516ebfe1e46528f7fa92e1c9ac8646bef4cdaa3f", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.40.3/MODULE.bazel": "668e6bcb4d957fc0e284316dba546b705c8d43c857f87119619ee83c4555b859", @@ -216,7 +216,8 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513", "https://bcr.bazel.build/modules/rules_cc/0.2.0/MODULE.bazel": "b5c17f90458caae90d2ccd114c81970062946f49f355610ed89bebf954f5783c", - "https://bcr.bazel.build/modules/rules_cc/0.2.0/source.json": "5f7f4e578e950adbf194217d4b607237a8197fc53ba46c367b3d61a86ecf35c2", + "https://bcr.bazel.build/modules/rules_cc/0.2.13/MODULE.bazel": "eecdd666eda6be16a8d9dc15e44b5c75133405e820f620a234acc4b1fdc5aa37", + "https://bcr.bazel.build/modules/rules_cc/0.2.13/source.json": "f872e892c5265c5532e526857532f4868708f88d64e5ebe517ea72e09da61bdb", "https://bcr.bazel.build/modules/rules_foreign_cc/0.10.1/MODULE.bazel": "b9527010e5fef060af92b6724edb3691970a5b1f76f74b21d39f7d433641be60", "https://bcr.bazel.build/modules/rules_foreign_cc/0.10.1/source.json": "9300e71df0cdde0952f10afff1401fa664e9fc5d9ae6204660ba1b158d90d6a6", "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6", diff --git a/cinterop-c/README.md b/cinterop-c/README.md index fc487d203..fbced9f9b 100644 --- a/cinterop-c/README.md +++ b/cinterop-c/README.md @@ -24,6 +24,13 @@ The binary can be updated by running ./gradlew :grpc:grpc-core:buildDependencyCLibGrpc_fat_iosArm64 ``` +### Compiling for Apple targets + +All Konan Apple targets have a corresponding build config in `.bazelrc`. +To tell Bazel the apple target constraints, we use the `apple_support` rules. +All apple target rules are defined in https://github.com/bazelbuild/apple_support/blob/master/configs/platforms.bzl. +For Konan Target to Apple triplet mapping, see https://kotlinlang.org/docs/native-target-support.html. + ### Compiling for Linux To produce K/N compatible static libraries, we use the Konan toolchain for compilation. diff --git a/cinterop-c/build_target.sh b/cinterop-c/build_target.sh index 227f3debc..93879af37 100755 --- a/cinterop-c/build_target.sh +++ b/cinterop-c/build_target.sh @@ -26,6 +26,8 @@ CONFIG=release mkdir -p "$(dirname "$DST")" echo "==> Building $LABEL to $DST" >&2 +echo "==> KONAN_HOME: $KONAN_HOME" >&2 +echo "==> KONAN_TARGET: $KONAN_TARGET" >&2 KONAN_DEP="--define=KONAN_DEPS=$HOME/.konan/dependencies" bazel build "$LABEL" --config="$KONAN_TARGET" --config="$CONFIG" "$KONAN_DEP" "--define=KONAN_HOME=$KONAN_HOME" diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_arm64.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_arm64.a new file mode 100755 index 000000000..4bc668966 Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_arm64.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_arm64.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_arm64.a.sha256 new file mode 100644 index 000000000..559c085ee --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_arm64.a.sha256 @@ -0,0 +1 @@ +2f1d56ea40ac752fafccd5aaa68590df5eea9079d415e12de195a310877a47e1 diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_simulator_arm64.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_simulator_arm64.a new file mode 100755 index 000000000..e4d10903b Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_simulator_arm64.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_simulator_arm64.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_simulator_arm64.a.sha256 new file mode 100644 index 000000000..7958a573e --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_simulator_arm64.a.sha256 @@ -0,0 +1 @@ +bc61d67cc2750cb1875d2746859d76b0ae8f8f55845953122b03eb3cc995919b diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_x64.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_x64.a new file mode 100755 index 000000000..139a3ea20 Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_x64.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_x64.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_x64.a.sha256 new file mode 100644 index 000000000..1f149fa11 --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.tvos_x64.a.sha256 @@ -0,0 +1 @@ +5802e8f19880b1896f9dcaf46d8ff2a6ca20358e50929d587240126387b0ccfc diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm32.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm32.a new file mode 100755 index 000000000..7b7b60514 Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm32.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm32.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm32.a.sha256 new file mode 100644 index 000000000..266684787 --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm32.a.sha256 @@ -0,0 +1 @@ +6c1a6cf7a5241b0ed0a67032e3a7a2dfe0f9a479a9a2404b9dcf950e5c1aaf45 diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm64.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm64.a new file mode 100755 index 000000000..27dda5483 Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm64.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm64.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm64.a.sha256 new file mode 100644 index 000000000..431fed861 --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_arm64.a.sha256 @@ -0,0 +1 @@ +4a855e7182aca9cddc2370c2a40f0c525a0c40c7c7b8976f5fae64f9dc297dae diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_device_arm64.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_device_arm64.a new file mode 100755 index 000000000..040969852 Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_device_arm64.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_device_arm64.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_device_arm64.a.sha256 new file mode 100644 index 000000000..228534d62 --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_device_arm64.a.sha256 @@ -0,0 +1 @@ +317559545327693f336cf170afc798b0e3edad693b12540a949ec4478ea48db2 diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_simulator_arm64.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_simulator_arm64.a new file mode 100755 index 000000000..b08a069d2 Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_simulator_arm64.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_simulator_arm64.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_simulator_arm64.a.sha256 new file mode 100644 index 000000000..0a0afadf1 --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_simulator_arm64.a.sha256 @@ -0,0 +1 @@ +bf68f618efa06869e12960484c18b7beaf91839bed113454e73e858eb0fa9d3c diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_x64.a b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_x64.a new file mode 100755 index 000000000..d58260ead Binary files /dev/null and b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_x64.a differ diff --git a/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_x64.a.sha256 b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_x64.a.sha256 new file mode 100644 index 000000000..a71f13e4d --- /dev/null +++ b/cinterop-c/prebuilt-deps/grpc_fat/libgrpc_fat.watchos_x64.a.sha256 @@ -0,0 +1 @@ +043d6f84fd5af676b6257b5d95d2d0cc68860562cc28edcd585cd9aeff9e77e6 diff --git a/docs/proxy-repositories.md b/docs/proxy-repositories.md index e11ff5611..b7c2d67c3 100644 --- a/docs/proxy-repositories.md +++ b/docs/proxy-repositories.md @@ -9,7 +9,7 @@ However, all dependency changes MUST be reviewed before running CI. For JetBrains developers, there is a possibility to use proxy repositories locally. It is actually encouraged to do so. -For it to work, add the following properties to your `$HOME/gradle/gradle.properties` file +For it to work, add the following properties to your `$HOME/.gradle/gradle.properties` file (or `local.properties` in the repository root): ```properties kotlinx.rpc.team.space.username= diff --git a/grpc/grpc-client/gradle.properties b/grpc/grpc-client/gradle.properties index 1603c27c0..f47945fef 100644 --- a/grpc/grpc-client/gradle.properties +++ b/grpc/grpc-client/gradle.properties @@ -5,12 +5,3 @@ kotlinx.rpc.exclude.wasmWasi=true kotlinx.rpc.exclude.js=true kotlinx.rpc.exclude.wasmJs=true kotlinx.rpc.exclude.mingwX64=true -kotlinx.rpc.exclude.tvosArm64=true -kotlinx.rpc.exclude.tvosSimulatorArm64=true -kotlinx.rpc.exclude.tvosX64=true -kotlinx.rpc.exclude.watchosArm32=true -kotlinx.rpc.exclude.watchosDeviceArm64=true -kotlinx.rpc.exclude.watchosX64=true -# TODO: Remove once we ant to activate WatchOS (these two targets are already prepared for activation) -kotlinx.rpc.exclude.watchosArm64=true -kotlinx.rpc.exclude.watchosSimulatorArm64=true diff --git a/grpc/grpc-core/gradle.properties b/grpc/grpc-core/gradle.properties index 1603c27c0..f47945fef 100644 --- a/grpc/grpc-core/gradle.properties +++ b/grpc/grpc-core/gradle.properties @@ -5,12 +5,3 @@ kotlinx.rpc.exclude.wasmWasi=true kotlinx.rpc.exclude.js=true kotlinx.rpc.exclude.wasmJs=true kotlinx.rpc.exclude.mingwX64=true -kotlinx.rpc.exclude.tvosArm64=true -kotlinx.rpc.exclude.tvosSimulatorArm64=true -kotlinx.rpc.exclude.tvosX64=true -kotlinx.rpc.exclude.watchosArm32=true -kotlinx.rpc.exclude.watchosDeviceArm64=true -kotlinx.rpc.exclude.watchosX64=true -# TODO: Remove once we ant to activate WatchOS (these two targets are already prepared for activation) -kotlinx.rpc.exclude.watchosArm64=true -kotlinx.rpc.exclude.watchosSimulatorArm64=true diff --git a/grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/test/RawClientTest.kt b/grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/test/RawClientTest.kt index 66b81d857..a304bd674 100644 --- a/grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/test/RawClientTest.kt +++ b/grpc/grpc-core/src/commonTest/kotlin/kotlinx/rpc/grpc/test/RawClientTest.kt @@ -154,7 +154,6 @@ class EchoServiceImpl : EchoService { * Run this on JVM before executing tests. */ @Test - @Ignore fun runServer() = runTest(timeout = Duration.INFINITE) { val server = GrpcServer( port = PORT, diff --git a/grpc/grpc-core/src/nativeInterop/cinterop/libkgrpc.def b/grpc/grpc-core/src/nativeInterop/cinterop/libkgrpc.def index c7d336302..ba733f5be 100644 --- a/grpc/grpc-core/src/nativeInterop/cinterop/libkgrpc.def +++ b/grpc/grpc-core/src/nativeInterop/cinterop/libkgrpc.def @@ -10,11 +10,21 @@ strictEnums = grpc_status_code grpc_connectivity_state grpc_call_error staticLibraries.macos_arm64 = libkgrpc.macos_arm64.a libgrpc_fat.macos_arm64.a staticLibraries.macos_x64 = libkgrpc.macos_x64.a libgrpc_fat.macos_x64.a + staticLibraries.ios_arm64 = libkgrpc.ios_arm64.a libgrpc_fat.ios_arm64.a staticLibraries.ios_simulator_arm64 = libkgrpc.ios_simulator_arm64.a libgrpc_fat.ios_simulator_arm64.a staticLibraries.ios_x64 = libkgrpc.ios_x64.a libgrpc_fat.ios_x64.a + +staticLibraries.watchos_arm64 = libkgrpc.watchos_arm64.a libgrpc_fat.watchos_arm64.a +staticLibraries.watchos_device_arm64 = libkgrpc.watchos_device_arm64.a libgrpc_fat.watchos_device_arm64.a +staticLibraries.watchos_simulator_arm64 = libkgrpc.watchos_simulator_arm64.a libgrpc_fat.watchos_simulator_arm64.a +staticLibraries.watchos_arm32 = libkgrpc.watchos_arm32.a libgrpc_fat.watchos_arm32.a +staticLibraries.watchos_x64 = libkgrpc.watchos_x64.a libgrpc_fat.watchos_x64.a + +staticLibraries.tvos_arm64 = libkgrpc.tvos_arm64.a libgrpc_fat.tvos_arm64.a +staticLibraries.tvos_simulator_arm64 = libkgrpc.tvos_simulator_arm64.a libgrpc_fat.tvos_simulator_arm64.a +staticLibraries.tvos_x64 = libkgrpc.tvos_x64.a libgrpc_fat.tvos_x64.a + staticLibraries.linux_arm64 = libkgrpc.linux_arm64.a libgrpc_fat.linux_arm64.a staticLibraries.linux_x64 = libkgrpc.linux_x64.a libgrpc_fat.linux_x64.a -# TODO: Uncomment when activating WatchOS -# staticLibraries.watchos_arm64 = libkgrpc_fat.watchos_arm64.a -# staticLibraries.watchos_simulator_arm64 = libkgrpc_fat.watchos_simulator_arm64.a + diff --git a/grpc/grpc-server/gradle.properties b/grpc/grpc-server/gradle.properties index 1603c27c0..f47945fef 100644 --- a/grpc/grpc-server/gradle.properties +++ b/grpc/grpc-server/gradle.properties @@ -5,12 +5,3 @@ kotlinx.rpc.exclude.wasmWasi=true kotlinx.rpc.exclude.js=true kotlinx.rpc.exclude.wasmJs=true kotlinx.rpc.exclude.mingwX64=true -kotlinx.rpc.exclude.tvosArm64=true -kotlinx.rpc.exclude.tvosSimulatorArm64=true -kotlinx.rpc.exclude.tvosX64=true -kotlinx.rpc.exclude.watchosArm32=true -kotlinx.rpc.exclude.watchosDeviceArm64=true -kotlinx.rpc.exclude.watchosX64=true -# TODO: Remove once we ant to activate WatchOS (these two targets are already prepared for activation) -kotlinx.rpc.exclude.watchosArm64=true -kotlinx.rpc.exclude.watchosSimulatorArm64=true diff --git a/protobuf/protobuf-core/gradle.properties b/protobuf/protobuf-core/gradle.properties index 1603c27c0..f47945fef 100644 --- a/protobuf/protobuf-core/gradle.properties +++ b/protobuf/protobuf-core/gradle.properties @@ -5,12 +5,3 @@ kotlinx.rpc.exclude.wasmWasi=true kotlinx.rpc.exclude.js=true kotlinx.rpc.exclude.wasmJs=true kotlinx.rpc.exclude.mingwX64=true -kotlinx.rpc.exclude.tvosArm64=true -kotlinx.rpc.exclude.tvosSimulatorArm64=true -kotlinx.rpc.exclude.tvosX64=true -kotlinx.rpc.exclude.watchosArm32=true -kotlinx.rpc.exclude.watchosDeviceArm64=true -kotlinx.rpc.exclude.watchosX64=true -# TODO: Remove once we ant to activate WatchOS (these two targets are already prepared for activation) -kotlinx.rpc.exclude.watchosArm64=true -kotlinx.rpc.exclude.watchosSimulatorArm64=true diff --git a/protobuf/protobuf-core/src/nativeInterop/cinterop/libprotowire.def b/protobuf/protobuf-core/src/nativeInterop/cinterop/libprotowire.def index a6d030cce..66bfa5656 100644 --- a/protobuf/protobuf-core/src/nativeInterop/cinterop/libprotowire.def +++ b/protobuf/protobuf-core/src/nativeInterop/cinterop/libprotowire.def @@ -3,14 +3,22 @@ headerFilter = protowire.h noStringConversion = pw_encoder_write_string - staticLibraries.macos_arm64 = libprotowire_fat.macos_arm64.a staticLibraries.macos_x64 = libprotowire_fat.macos_x64.a + staticLibraries.ios_arm64 = libprotowire_fat.ios_arm64.a staticLibraries.ios_simulator_arm64 = libprotowire_fat.ios_simulator_arm64.a staticLibraries.ios_x64 = libprotowire_fat.ios_x64.a + +staticLibraries.watchos_arm64 = libprotowire_fat.watchos_arm64.a +staticLibraries.watchos_device_arm64 = libprotowire_fat.watchos_device_arm64.a +staticLibraries.watchos_simulator_arm64 = libprotowire_fat.watchos_simulator_arm64.a +staticLibraries.watchos_arm32 = libprotowire_fat.watchos_arm32.a +staticLibraries.watchos_x64 = libprotowire_fat.watchos_x64.a + +staticLibraries.tvos_arm64 = libprotowire_fat.tvos_arm64.a +staticLibraries.tvos_simulator_arm64 = libprotowire_fat.tvos_simulator_arm64.a +staticLibraries.tvos_x64 = libprotowire_fat.tvos_x64.a + staticLibraries.linux_arm64 = libprotowire_fat.linux_arm64.a staticLibraries.linux_x64 = libprotowire_fat.linux_x64.a -# TODO: Uncomment when activating WatchOS -# staticLibraries.watchos_arm64 = libprotowire_fat.watchos_arm64_32.a -# staticLibraries.watchos_simulator_arm64 = libprotowire_fat.watchos_sim_arm64.a \ No newline at end of file