Skip to content

Commit af749cd

Browse files
rimonyrimony
committed
test jsons added to project
build fail fix Prov. signing changed to automatic BLEService.ts API functions signature fix
1 parent 4894afb commit af749cd

File tree

10 files changed

+40
-24
lines changed

10 files changed

+40
-24
lines changed

‎ios/codeAgainstCorona.xcodeproj/project.pbxproj

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
1212
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
1313
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
14+
208E7CE72472E35B001C2D93 /* outputserverReponse.json in Resources */ = {isa = PBXBuildFile; fileRef = 208E7CE52472E35B001C2D93 /* outputserverReponse.json */; };
15+
208E7CE82472E35B001C2D93 /* outputserverReponse.json in Resources */ = {isa = PBXBuildFile; fileRef = 208E7CE52472E35B001C2D93 /* outputserverReponse.json */; };
16+
208E7CE92472E35B001C2D93 /* outputcontacts.json in Resources */ = {isa = PBXBuildFile; fileRef = 208E7CE62472E35B001C2D93 /* outputcontacts.json */; };
17+
208E7CEA2472E35B001C2D93 /* outputcontacts.json in Resources */ = {isa = PBXBuildFile; fileRef = 208E7CE62472E35B001C2D93 /* outputcontacts.json */; };
1418
ACE92AE39AB97EC6E1FCB1F0 /* libPods-hamagen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 255E6F5C10E31B05B2AF7E1D /* libPods-hamagen.a */; };
1519
D52A57B4241E29B800521B22 /* SimplerPro_V3-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = D52A57B0241E29B800521B22 /* SimplerPro_V3-Regular.otf */; };
1620
D52A57B5241E29B800521B22 /* SimplerPro_V3-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = D52A57B1241E29B800521B22 /* SimplerPro_V3-Light.otf */; };
@@ -46,6 +50,8 @@
4650
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = codeAgainstCorona/Info.plist; sourceTree = "<group>"; };
4751
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = codeAgainstCorona/main.m; sourceTree = "<group>"; };
4852
17128358241FCBDE007B9600 /* Code against corona.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = "Code against corona.entitlements"; path = "codeAgainstCorona/Code against corona.entitlements"; sourceTree = "<group>"; };
53+
208E7CE52472E35B001C2D93 /* outputserverReponse.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = outputserverReponse.json; sourceTree = "<group>"; };
54+
208E7CE62472E35B001C2D93 /* outputcontacts.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = outputcontacts.json; sourceTree = "<group>"; };
4955
21858F4152B91CBBAEADF062 /* Pods-hamagen-qa.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-hamagen-qa.release.xcconfig"; path = "Target Support Files/Pods-hamagen-qa/Pods-hamagen-qa.release.xcconfig"; sourceTree = "<group>"; };
5056
255E6F5C10E31B05B2AF7E1D /* libPods-hamagen.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-hamagen.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5157
306EADB8C444D747A3FC1024 /* libPods-codeAgainstCorona-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-codeAgainstCorona-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -146,6 +152,8 @@
146152
83CBB9F61A601CBA00E9B192 = {
147153
isa = PBXGroup;
148154
children = (
155+
208E7CE62472E35B001C2D93 /* outputcontacts.json */,
156+
208E7CE52472E35B001C2D93 /* outputserverReponse.json */,
149157
D5BCF08D24641F8800FC4B8C /* המגןRelease.entitlements */,
150158
D52A57DD24204EB200521B22 /* המגן QA.entitlements */,
151159
13B07FAE1A68108700A75B9A /* codeAgainstCorona */,
@@ -281,11 +289,11 @@
281289
13B07F861A680F5B00A75B9A = {
282290
DevelopmentTeam = N3P977USJJ;
283291
LastSwiftMigration = 1120;
284-
ProvisioningStyle = Manual;
292+
ProvisioningStyle = Automatic;
285293
};
286294
D52A57BF24203FBB00521B22 = {
287295
DevelopmentTeam = N3P977USJJ;
288-
ProvisioningStyle = Manual;
296+
ProvisioningStyle = Automatic;
289297
};
290298
};
291299
};
@@ -318,7 +326,9 @@
318326
D52A57B6241E29B800521B22 /* SimplerPro_V3-Black.otf in Resources */,
319327
D52A57BB241FE12000521B22 /* Images.xcassets in Resources */,
320328
D52A57B7241E29B800521B22 /* SimplerPro_V3-Bold.otf in Resources */,
329+
208E7CE72472E35B001C2D93 /* outputserverReponse.json in Resources */,
321330
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
331+
208E7CE92472E35B001C2D93 /* outputcontacts.json in Resources */,
322332
D52A57B5241E29B800521B22 /* SimplerPro_V3-Light.otf in Resources */,
323333
D52A57DC2420405900521B22 /* GoogleService-Info.plist in Resources */,
324334
);
@@ -333,9 +343,11 @@
333343
D52A57CC24203FBB00521B22 /* Images.xcassets in Resources */,
334344
D52A57CD24203FBB00521B22 /* SimplerPro_V3-Bold.otf in Resources */,
335345
D52A57CE24203FBB00521B22 /* LaunchScreen.xib in Resources */,
346+
208E7CEA2472E35B001C2D93 /* outputcontacts.json in Resources */,
336347
D52A57D024203FBB00521B22 /* SimplerPro_V3-Light.otf in Resources */,
337348
D52A57DA2420404900521B22 /* GoogleService-Info.plist in Resources */,
338349
D52A57D82420403100521B22 /* Info-qa.plist in Resources */,
350+
208E7CE82472E35B001C2D93 /* outputserverReponse.json in Resources */,
339351
);
340352
runOnlyForDeploymentPostprocessing = 0;
341353
};
@@ -540,11 +552,11 @@
540552
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
541553
CLANG_ENABLE_MODULES = YES;
542554
CODE_SIGN_ENTITLEMENTS = "codeAgainstCorona/Code against corona.entitlements";
543-
CODE_SIGN_IDENTITY = "iPhone Developer";
544-
CODE_SIGN_STYLE = Manual;
555+
CODE_SIGN_IDENTITY = "Apple Development";
556+
CODE_SIGN_STYLE = Automatic;
545557
CURRENT_PROJECT_VERSION = 49;
546558
DEAD_CODE_STRIPPING = NO;
547-
DEVELOPMENT_TEAM = N3P977USJJ;
559+
DEVELOPMENT_TEAM = "";
548560
INFOPLIST_FILE = codeAgainstCorona/Info.plist;
549561
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
550562
MARKETING_VERSION = 2.0.1;
@@ -555,7 +567,7 @@
555567
);
556568
PRODUCT_BUNDLE_IDENTIFIER = com.hamagen;
557569
PRODUCT_NAME = "המגן";
558-
PROVISIONING_PROFILE_SPECIFIER = "Hamagen Dev";
570+
PROVISIONING_PROFILE_SPECIFIER = "";
559571
SWIFT_OBJC_BRIDGING_HEADER = "codeAgainstCorona-Bridging-Header.h";
560572
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
561573
SWIFT_VERSION = 5.0;
@@ -699,11 +711,11 @@
699711
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
700712
CLANG_ENABLE_MODULES = YES;
701713
CODE_SIGN_ENTITLEMENTS = "המגן QA.entitlements";
702-
CODE_SIGN_IDENTITY = "iPhone Developer";
703-
CODE_SIGN_STYLE = Manual;
714+
CODE_SIGN_IDENTITY = "Apple Development";
715+
CODE_SIGN_STYLE = Automatic;
704716
CURRENT_PROJECT_VERSION = 49;
705717
DEAD_CODE_STRIPPING = NO;
706-
DEVELOPMENT_TEAM = N3P977USJJ;
718+
DEVELOPMENT_TEAM = "";
707719
FRAMEWORK_SEARCH_PATHS = (
708720
"$(inherited)",
709721
"$(PROJECT_DIR)/Pods/TSBackgroundFetch/ios/TSBackgroundFetch",
@@ -721,7 +733,7 @@
721733
);
722734
PRODUCT_BUNDLE_IDENTIFIER = com.hamagen.qa;
723735
PRODUCT_NAME = "המגן QA";
724-
PROVISIONING_PROFILE_SPECIFIER = "Hamagen QA Dev";
736+
PROVISIONING_PROFILE_SPECIFIER = "";
725737
SWIFT_OBJC_BRIDGING_HEADER = "codeAgainstCorona-Bridging-Header.h";
726738
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
727739
SWIFT_VERSION = 5.0;

‎ios/codeAgainstCorona.xcworkspace/contents.xcworkspacedata

100755100644
File mode changed.

‎ios/codeAgainstCorona.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

100755100644
File mode changed.

‎ios/codeAgainstCorona.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ios/outputcontacts.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎ios/outputserverReponse.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"startDay": 18391, "infected": [[[], [], [], [], [], [], [], [], [], [], [], ["d86acf8fcd88bccf59271479cb8ab4e7"], ["a1c50b8346cda9e99deae630eb082076"], ["8f3f28d171d634053945f8c45a9de13d"], ["4583836471de3b66a02f08ae967b6ff6"], ["2900e04006206507552090cbb72638c7"], ["bc528050879b017acac9cce31b1e40ab"], ["822d5175db672831405b0eb00586b0bb"], ["979150b9646e04092d0fceb50405f455"], ["18a905f08b4b6a03bcab0ab7f23f2a47"], ["ec1fb13ba29f9cac072781bf9e05de58"], ["8414f4341b6074e188bbda066b59fe22"], ["f8d0ef30fe99672a99acde3190d7ac6b"], ["d1d3fb2f76058524fa480ee146af2f4b"]], [["ab7fbfacec741e6a3b87699066089100"], ["73ac75c6d89f99910badaead43676727"], ["d3cf15f5504382b5e38183e656482f06"], ["98b5da9c93139135004bef54fff007c0"], ["d7560ec50893efe7cdc724d5d19cc346"], ["060cc0c4f0befc6d7d4ac552f21cb14d"], ["cf443854c7b3721f5a363600da824e65"], ["e6bda1c893e7bfdc46fb45b3f2399c8a"], ["33ba45a91e601813ec0c3a47d8c003b7"], ["5ac06c5919ad46b3dbfafed591e744e1"], ["68541fb793ee86c374305e7a6142e8d6"], ["bce1bcabee672c22465052d79396efae"], ["574fbce2594d4eb2c2b22f84fcff2985"], ["adf2841fb1392b20f57403244bd85a83"], ["66687d23c5de4ee21310a7b563b9fde5"], ["995b04f2d0bd6bed94e6bc41bd788932"], ["d8a2835a13878c3a3081f61e91183cfd"], ["eef0ac65fbed31ba70fa43c94af0ad7b"], ["c4d19c84cffddf1dd3ed3d954c058402"], ["31b93e0dfbe4b29633a2c2f0916d0570"], ["f3aa7d7b907c0d58b241d0843cd01edb"], ["81681a8484fa68381cc079e444c24ac9"], ["4d8d26a80cd3fe617b3ad2130c69a590"], ["4449e8cf936fccaa06fa0a14a53778b7"]], [["e6f62e01c37be1d40d489a3e59ccc30b"], ["a9e8139d001d699a92d5d9949faa2772"], ["58fb0f26e8e4ba9a4823ecac34c4e6fe"], ["9105885533a09562a866deffe143f836"], ["512acee6be9e551ce06598693d9e9c37"], ["ecb44b82828f080b17b4d7f036cdd7cc"], ["5a1fd4337d1bcf6a058f993d7dfd695b"], ["202ff2794dd72f7ed684b3239650d12f"], ["e40868dfb3e3a1a28dce1bc3d8b48fa6"], ["23d7edfe3c2c1944db47525ba52cb87b"], ["00c28e77ae15b1813f46c52a1bc19d62"], ["ab82491271aab40d6bc39a395e505035"], ["e5e713d791f464d3c98d43634db2bc4f"], ["1e7c6b82340f668ce8fed1b1d76334c9"], ["59d7d1904ec100266b87e888916474b0"], ["188d8bbf0394ed13eff0a431ecfc1647"], ["d6224a732fd898d377bc5c5b5e198df0"], ["773549f841f79a22cc5b23d5f7ce3104"], ["ef479261f2e3379dc59327948192fd4f"], ["c5ff03cfb85b7a8cddd65df3654a8029"], ["7e81b6399b171dee77b003c99e9b39b7"], ["e6e720c311119214eb2b1827e3ea785b"], ["de8200818cafd179e870853631f2d142"], ["61d478106464aad6691ca4e631402bbd"]], [["98c75234e78c3da10295ebab1ad60e44"], ["a42d0e96e906b90d2330fbe3bf958300"], ["dde5c88775275401f95b8ac232e52843"], ["faa892b404000a3a6c843010c98f54c3"], ["e6fa41ab94c48559ee30bc6c23d3a266"], ["d864eed72a26d7dcb6ba94a5d46ff172"], ["a1a2b817460d2526c8072d1b00c39774"], ["16a1df31beb6c2025cf7482aa03bf4aa"], ["c07549d1d17bc83995fe5ff466e94fd6"], ["d77d4286486ba1e4caf4e07fe1723c71"], ["b41e1da1a16a1491110898cf94967971"], ["1a7455899b879dece82145776ad77f72"], ["7e2b6dfc7df8b11d439c152a1e4d4812"], ["133fab9adfeb9da4c7f80bed5c58c424"], ["1f523b4f87408248373368bae7c5b711"], ["0736b002c41032bac14032aae1d91500"], ["49b99f9b4a4a80eac2a0ce6e5e502004"], ["9ad9470d6078ab69c2df8f01c7ec4506"], ["33b008843bc1ad094a9337eea17a8b5f"], ["46dd52218f0a3e7b4dd6cb92f13f65f3"], ["562f510864da2482e180c2f39758b029"], ["fd152b5da7baf407a3312b85330abbd7"], ["0ed7a1ee04642e8e3676ea2ca73df6b1"], ["a431c48d6d858f3afd9dc46526ec2793"]], [["a24bc113635f36b05ecd8279bc1ba129"], ["eb7906c6c4106f4f53af22a818ba7f93"], ["85e3864d81b87d23ae1f124ae4317381"], ["519ca4abe41f2fc49ba084e108b6f326"], ["6131c99a51ac8043c46a034e526c9e9f"], ["84a6e5bbe59e118124328e0ea238fa97"], ["2da86dbacad7ef1657397b336fa21e5d"], ["8498aca7e5b71b9223d1b49bc05425af"], ["d40437a9823ed4fa09363363f0540370"], ["489f379b8a6bc1a9508db8be97dac21a"], ["4acb35e55dd37fad239e29ce82a8ecea"], ["621f33c97d127d37571a8512a3d3d1e4"], ["cd94ee72811942a93d430eb0735f425a"], ["ad70249c823ed79feeb29d603c300554"], ["62f5b9ef6f302dc34e7922c4f25e7b8a"], ["18b87eaf4ed530b8532d651bf6afb812"], ["063cc9426201a5fe34935e196bc0c583"], ["b0f3bc65f0bdcdeb15079292f89482ed"], ["0ad3c8d5c6f676f5d48c295faeeb09d5"], ["34395ab165032d0bde56624098f72678"], ["e8759406306893dd63904884e8465bb0"], ["0c890b516186908f97bd1716fef2262f"], ["aad42ceb819a91b9fa40670e3f2a2fb8"], ["cef56d5506c9b160e616a05bf6dcc4e7"]], [["be51da228972bafe4bef4375e90deb77"], ["a61fc49dd43535365690404b0dea2bb7"], ["82f250e7bc612acb29635764c2df24ff"], ["2554c41aadb008dcb6ebddadd5f4efde"], ["bb9179a32416c00a8ecb41d43890d79f"], ["051af2488b9527901ffa044dffff1985"], ["8673fdfa780f5bb64cf82b5d66e98d00"], ["26a9d822ef9b5f0e6fb3d6ea0295163f"], ["8d5fe0cf86d228112e824b28324c3524"], ["e2c0e9fb515df2cb9c62ffb52ae1edef"], ["86fa346b218310fba4dfca6c8be4e826"], ["4927f7c5a624bf6d8aaf122044c4a8a0"], ["f7d0135808852d66afb7163773a66f65"], ["74393ed084aed9820712ee3d04ca62a1"], ["070ce965ebd0efdd7a22998ef06f2a70"], ["3de825066d19b0ddd38c961a0dbc46dd"], ["4c776ce81bc368412177842165be29f9"], ["abe6f476338af7a5cbed4c44814faf71"], ["115ab3bb2ead18ca29862220306c0bc9"], ["8b1dcc2f9eccf48f823773b4c574118b"], ["09a6e9503c852eec10baebb0c0becde3"], ["4d0ac7761e2f694167c1620f5b985ff5"], ["57be6be710c214db198f5adb1c944451"], ["7ff5f2c67a9c3a498c745de94a6e830c"]], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []]]}

‎package-lock.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"react-redux": "7.1.3",
6363
"redux": "4.0.5",
6464
"redux-thunk": "2.3.0",
65-
"rn-contact-tracing": "https://github.com/wix-incubator/rn-contact-tracing.git#master",
65+
"rn-contact-tracing": "git+https://github.com/wix-incubator/rn-contact-tracing.git#iOS-Crypto",
6666
"rn-fetch-blob": "0.12.0",
6767
"seedrandom": "^3.0.5",
6868
"sha256": "00.2.0",

‎src/services/BLEService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const initBLETracing = () => new Promise(async (resolve) => {
3131
}
3232

3333
await SpecialBle.setConfig(config);
34-
IS_IOS ? await SpecialBle.startBLEService(UUID) : await SpecialBle.startBLEService();
34+
await SpecialBle.startBLEService();
3535

3636
resolve();
3737
} catch (error) {

‎yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7220,9 +7220,9 @@ rimraf@~2.2.6:
72207220
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
72217221
integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
72227222

7223-
"rn-contact-tracing@https://github.com/wix-incubator/rn-contact-tracing.git#master":
7223+
"rn-contact-tracing@git+https://github.com/wix-incubator/rn-contact-tracing.git#iOS-Crypto":
72247224
version "0.0.3"
7225-
resolved "https://github.com/wix-incubator/rn-contact-tracing.git#32661410af11a1aac7d6e28f42eb89cc53049ccf"
7225+
resolved "git+https://github.com/wix-incubator/rn-contact-tracing.git#b0f403905d13c77e6378bdbdf0210821025c852e"
72267226

72277227
[email protected]:
72287228
version "0.12.0"

0 commit comments

Comments
 (0)