Skip to content

Commit ef7e5af

Browse files
committed
adding platform setting to each service
1 parent 428d0d8 commit ef7e5af

File tree

6 files changed

+11
-4
lines changed

6 files changed

+11
-4
lines changed

docker-compose/docker-compose.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
services:
22
wallet-api:
3+
platform: linux/x86_64
34
image: docker.io/waltid/wallet-api:${VERSION_TAG:-latest}
45
profiles:
56
- services
@@ -63,6 +64,7 @@ services:
6364
OPA_SERVER_URL: "http://opa-server:8181"
6465

6566
waltid-demo-wallet:
67+
platform: linux/x86_64
6668
image: docker.io/waltid/waltid-demo-wallet:${VERSION_TAG:-latest}
6769
profiles:
6870
- apps
@@ -81,6 +83,7 @@ services:
8183
PORT: $DEMO_WALLET_FRONTEND_PORT
8284

8385
waltid-dev-wallet:
86+
platform: linux/x86_64
8487
image: docker.io/waltid/waltid-dev-wallet:${VERSION_TAG:-latest}
8588
profiles:
8689
- apps

local.properties

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Setup for Android:
22
#sdk.dir=/home/xyz/your-android-sdk-directory
3+
sdk.dir=/Users/alegomes/Library/Android/sdk/

settings.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ pluginManagement {
9292

9393
plugins {
9494
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
95+
id("org.jetbrains.kotlinx.kover.aggregation") version "0.9.1"
9596
}
9697

9798
rootProject.name = "waltid-identity"

waltid-libraries/crypto/waltid-target-ios/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ kotlin {
2424
cinterops.create("implementation") {
2525
val interopTask = tasks[interopProcessingTaskName]
2626
interopTask.dependsOn(":waltid-libraries:crypto:${project.name}:$iosUtilsProjectName:$iosUtilsProjectName-$target")
27-
headers("$projectDir/$iosUtilsProjectName/build/$target/Release-$sdk/include/waltid_crypto_ios_utils/waltid_crypto_ios_utils-Swift.h")
27+
//headers("$projectDir/$iosUtilsProjectName/build/$target/Release-$sdk/include/waltid_crypto_ios_utils/waltid_crypto_ios_utils-Swift.h")
28+
headers(file("$projectDir/$iosUtilsProjectName/build/$target/Release-$sdk/include/waltid_crypto_ios_utils/waltid_crypto_ios_utils-Swift.h").absolutePath)
2829
}
2930
}
3031
}

waltid-libraries/crypto/waltid-target-ios/implementation/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
1313

1414
PODFILE CHECKSUM: 1c1177ae9cbed05fc7d502ffeacd70165412b448
1515

16-
COCOAPODS: 1.15.2
16+
COCOAPODS: 1.16.2

waltid-libraries/crypto/waltid-target-ios/implementation/waltid.crypto.ios.utils.xcodeproj/project.pbxproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
isa = PBXProject;
111111
attributes = {
112112
BuildIndependentTargetsInParallel = 1;
113-
LastUpgradeCheck = 1520;
113+
LastUpgradeCheck = 1620;
114114
TargetAttributes = {
115115
B3C327E82C20498600EABCC6 = {
116116
CreatedOnToolsVersion = 15.2;
@@ -175,7 +175,7 @@
175175
);
176176
runOnlyForDeploymentPostprocessing = 0;
177177
shellPath = /bin/sh;
178-
shellScript = "targetDir=${BUILT_PRODUCTS_DIR}/include/${PRODUCT_MODULE_NAME}/\nmkdir -p $targetDir\ncp ${DERIVED_SOURCES_DIR}/*-Swift.h ${targetDir}\n";
178+
shellScript = "targetDir=${BUILT_PRODUCTS_DIR}/include/${PRODUCT_MODULE_NAME}/\necho \"-----> targetDir=${targetDir}\"\necho \"-----> DERIVED_SOURCES_DIR=${DERIVED_SOURCES_DIR}\"\nmkdir -p \"$targetDir\"\ncp \"${DERIVED_SOURCES_DIR}\"/*-Swift.h ${targetDir}\n";
179179
};
180180
B3C327F92C204DEF00EABCC6 /* CP Products */ = {
181181
isa = PBXShellScriptBuildPhase;
@@ -322,6 +322,7 @@
322322
MTL_ENABLE_DEBUG_INFO = NO;
323323
MTL_FAST_MATH = YES;
324324
SDKROOT = iphoneos;
325+
SWIFT_COMPILATION_MODE = wholemodule;
325326
VALIDATE_PRODUCT = YES;
326327
};
327328
name = Release;

0 commit comments

Comments
 (0)