- wip

MohGovIL · May 17, 2020 · 34a0280 · 34a0280
1 parent 1651bb9
commit 34a0280
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 77 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -341,6 +341,8 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
     - ReactCommon/jscallinvoker (= 0.61.5)
+  - rn-contact-tracing (0.0.3):
+    - React
   - rn-fetch-blob (0.12.0):
     - React-Core
   - RNBackgroundFetch (2.7.1):
@@ -425,6 +427,7 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - rn-contact-tracing (from `../node_modules/rn-contact-tracing`)
   - rn-fetch-blob (from `../node_modules/rn-fetch-blob`)
   - RNBackgroundFetch (from `../node_modules/react-native-background-fetch`)
   - RNBackgroundGeolocation (from `../node_modules/react-native-background-geolocation`)
@@ -540,6 +543,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Vibration"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  rn-contact-tracing:
+    :path: "../node_modules/rn-contact-tracing"
   rn-fetch-blob:
     :path: "../node_modules/rn-fetch-blob"
   RNBackgroundFetch:
@@ -626,6 +631,7 @@ SPEC CHECKSUMS:
   React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
   React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
+  rn-contact-tracing: fe147c2be110646d1aa401e15c0065ad1bc25fd8
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNBackgroundFetch: 8d8d66b47eafcb9e772b2eb95057939038b3ef95
   RNBackgroundGeolocation: 8f0a20788100fbf08987d80f2053ae6eba79c566

diff --git a/ios/codeAgainstCorona.xcodeproj/project.pbxproj b/ios/codeAgainstCorona.xcodeproj/project.pbxproj
@@ -32,27 +32,8 @@
 		D52A57DC2420405900521B22 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D52A57DB2420405800521B22 /* GoogleService-Info.plist */; };
 		D5CC7DD824236B25007E3977 /* RNBackgroundFetch+AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D5CC7DD724236B25007E3977 /* RNBackgroundFetch+AppDelegate.m */; };
 		D5CC7DD924236B25007E3977 /* RNBackgroundFetch+AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D5CC7DD724236B25007E3977 /* RNBackgroundFetch+AppDelegate.m */; };
-		D5F854D6246D26D90053B307 /* libSpecialBle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D5F854D5246D26C10053B307 /* libSpecialBle.a */; };
-		D5F854D7246D26DF0053B307 /* libSpecialBle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D5F854D5246D26C10053B307 /* libSpecialBle.a */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		D5CC7DC7242357EA007E3977 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D5CC7DC3242357EA007E3977 /* RNBackgroundGeolocation.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 83FF5F851AFD0D2B0016A13E;
-			remoteInfo = RNBackgroundGeolocation;
-		};
-		D5F854D4246D26C10053B307 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = D5F854D0246D26C10053B307 /* SpecialBle.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 134814201AA4EA6300B7C361;
-			remoteInfo = SpecialBle;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
 		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
 		06C33C418EB6D49AE30A90FC /* Pods-hamagen.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-hamagen.debug.xcconfig"; path = "Target Support Files/Pods-hamagen/Pods-hamagen.debug.xcconfig"; sourceTree = "<group>"; };
@@ -91,10 +72,8 @@
 		D52A57F12422D39600521B22 /* libRNBackgroundFetch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRNBackgroundFetch.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		D5AE4CD7FF26A69806CF4680 /* Pods-hamagen.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-hamagen.release.xcconfig"; path = "Target Support Files/Pods-hamagen/Pods-hamagen.release.xcconfig"; sourceTree = "<group>"; };
 		D5BCF08D24641F8800FC4B8C /* המגןRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "המגןRelease.entitlements"; sourceTree = "<group>"; };
-		D5CC7DC3242357EA007E3977 /* RNBackgroundGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNBackgroundGeolocation.xcodeproj; path = "../node_modules/react-native-background-geolocation/ios/RNBackgroundGeolocation.xcodeproj"; sourceTree = "<group>"; };
 		D5CC7DC924235864007E3977 /* TSBackgroundFetch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TSBackgroundFetch.framework; path = Pods/TSBackgroundFetch/ios/TSBackgroundFetch/TSBackgroundFetch.framework; sourceTree = "<group>"; };
 		D5CC7DD724236B25007E3977 /* RNBackgroundFetch+AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "RNBackgroundFetch+AppDelegate.m"; path = "../node_modules/react-native-background-fetch/ios/RNBackgroundFetch/RNBackgroundFetch+AppDelegate.m"; sourceTree = "<group>"; };
-		D5F854D0246D26C10053B307 /* SpecialBle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SpecialBle.xcodeproj; path = "../node_modules/rn-contact-tracing/lib/ios/SpecialBle.xcodeproj"; sourceTree = "<group>"; };
 		D63C3A392EF9FA65DE3BC9DD /* libPods-hamagen-qa.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-hamagen-qa.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		EAB71A48ABBFB468FB6DA26E /* Pods-codeAgainstCoronaTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-codeAgainstCoronaTests.debug.xcconfig"; path = "Target Support Files/Pods-codeAgainstCoronaTests/Pods-codeAgainstCoronaTests.debug.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
@@ -106,7 +85,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D5F854D7246D26DF0053B307 /* libSpecialBle.a in Frameworks */,
 				ACE92AE39AB97EC6E1FCB1F0 /* libPods-hamagen.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -115,7 +93,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D5F854D6246D26D90053B307 /* libSpecialBle.a in Frameworks */,
 				01ED0E232755E55EE7A5FDDD /* libPods-hamagen-qa.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -162,8 +139,6 @@
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				D5F854D0246D26C10053B307 /* SpecialBle.xcodeproj */,
-				D5CC7DC3242357EA007E3977 /* RNBackgroundGeolocation.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -249,22 +224,6 @@
 			path = qa;
 			sourceTree = "<group>";
 		};
-		D5CC7DC4242357EA007E3977 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				D5CC7DC8242357EA007E3977 /* libRNBackgroundGeolocation.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		D5F854D1246D26C10053B307 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				D5F854D5246D26C10053B307 /* libSpecialBle.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -342,16 +301,6 @@
 			mainGroup = 83CBB9F61A601CBA00E9B192;
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = D5CC7DC4242357EA007E3977 /* Products */;
-					ProjectRef = D5CC7DC3242357EA007E3977 /* RNBackgroundGeolocation.xcodeproj */;
-				},
-				{
-					ProductGroup = D5F854D1246D26C10053B307 /* Products */;
-					ProjectRef = D5F854D0246D26C10053B307 /* SpecialBle.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				13B07F861A680F5B00A75B9A /* hamagen */,
@@ -360,23 +309,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		D5CC7DC8242357EA007E3977 /* libRNBackgroundGeolocation.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libRNBackgroundGeolocation.a;
-			remoteRef = D5CC7DC7242357EA007E3977 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		D5F854D5246D26C10053B307 /* libSpecialBle.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libSpecialBle.a;
-			remoteRef = D5F854D4246D26C10053B307 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		13B07F8E1A680F5B00A75B9A /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -432,10 +364,12 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-hamagen-qa/Pods-hamagen-qa-resources.sh",
 				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/rn-contact-tracing/FrameworkModel.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FrameworkModel.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -546,10 +480,12 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-hamagen/Pods-hamagen-resources.sh",
 				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/rn-contact-tracing/FrameworkModel.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FrameworkModel.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -702,7 +638,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -748,7 +684,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -775,6 +711,7 @@
 					"$(PROJECT_DIR)/../node_modules/react-native-background-geolocation/ios",
 				);
 				INFOPLIST_FILE = "codeAgainstCorona/Info-qa.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 1.3.10;
 				OTHER_LDFLAGS = (
@@ -811,6 +748,7 @@
 					"$(PROJECT_DIR)/../node_modules/react-native-background-geolocation/ios",
 				);
 				INFOPLIST_FILE = "codeAgainstCorona/Info-qa.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 1.3.10;
 				OTHER_LDFLAGS = (

diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "react-redux": "7.1.3",
     "redux": "4.0.5",
     "redux-thunk": "2.3.0",
-    "rn-contact-tracing": "^0.0.4",
+    "rn-contact-tracing": "https://github.com/wix-incubator/rn-contact-tracing.git#master",
     "rn-fetch-blob": "0.12.0",
     "seedrandom": "^3.0.5",
     "sha256": "00.2.0",

diff --git a/react-native.config.js b/react-native.config.js
@@ -2,8 +2,7 @@ module.exports = {
   dependencies: {
     'rn-contact-tracing': {
       platforms: {
-        android: null,
-        ios: null
+        android: null
       }
     }
   }

diff --git a/yarn.lock b/yarn.lock
@@ -7460,10 +7460,9 @@ rimraf@~2.2.6:
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
   integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
-rn-contact-tracing@^0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/rn-contact-tracing/-/rn-contact-tracing-0.0.4.tgz#d7b3dbe8fb3b1e3fe2392c9a53255558851257c5"
-  integrity sha512-z1/hNnw3Egg+0L3JfR51g+FF+2g9nE7v8y4CTPIggEvtmP8Q/hlRkjfoLfKOLzLSk4BRSjhVomUn7q2S2E6OCw==
+"rn-contact-tracing@https://github.com/wix-incubator/rn-contact-tracing.git#master":
+  version "0.0.3"
+  resolved "https://github.com/wix-incubator/rn-contact-tracing.git#32060f3c14593630fc2e3b7d45c563b1fd84f357"
 
 rn-fetch-blob@0.12.0:
   version "0.12.0"