Merge branch 'develop' into 'master'

Develop See merge request papers/airgap/airgap-vault!259
airgap-it · Jul 29, 2021 · ec10ff6 · ec10ff6
2 parents 2c029f8 + 9efd5a8
commit ec10ff6
Show file tree

Hide file tree

Showing 97 changed files with 8,483 additions and 6,638 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ unit:
   script:
     - docker run --name unit-$CI_COMMIT_SHA $GOOGLE_TAG npm run test-ci
     - docker run --name lint-$CI_COMMIT_SHA $GOOGLE_TAG npm run lint-ci
-    - docker cp unit-$CI_COMMIT_SHA:/app/coverage/lcov.info lcov.info
+    - docker cp unit-$CI_COMMIT_SHA:/app/src/coverage/report-lcov/lcov.info lcov.info
     - docker cp lint-$CI_COMMIT_SHA:/app/lintReport.json lintReport.json
   after_script:
     - docker rm unit-$CI_COMMIT_SHA

diff --git a/angular.json b/angular.json
@@ -202,7 +202,8 @@
     }
   },
   "cli": {
-    "defaultCollection": "@ionic/angular-toolkit"
+    "defaultCollection": "@ionic/angular-toolkit",
+    "analytics": false
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -9,8 +9,8 @@
 /* Begin PBXBuildFile section */
 		2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
 		49690A7E25C2BF80004A3586 /* VaultError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49690A7D25C2BF80004A3586 /* VaultError.swift */; };
-		49D642732629D22A0066C013 /* SaplingFFI in Frameworks */ = {isa = PBXBuildFile; productRef = 49D642722629D22A0066C013 /* SaplingFFI */; };
-		49D642752629D22A0066C013 /* Sapling in Frameworks */ = {isa = PBXBuildFile; productRef = 49D642742629D22A0066C013 /* Sapling */; };
+		49D642732629D22A0066C013 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 49D642722629D22A0066C013 /* SwiftPackageProductDependency */; };
+		49D642752629D22A0066C013 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 49D642742629D22A0066C013 /* SwiftPackageProductDependency */; };
 		50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
 		504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
 		504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
@@ -72,9 +72,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				49D642752629D22A0066C013 /* Sapling in Frameworks */,
+				49D642752629D22A0066C013 /* BuildFile in Frameworks */,
 				A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
-				49D642732629D22A0066C013 /* SaplingFFI in Frameworks */,
+				49D642732629D22A0066C013 /* BuildFile in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -215,8 +215,8 @@
 			);
 			name = App;
 			packageProductDependencies = (
-				49D642722629D22A0066C013 /* SaplingFFI */,
-				49D642742629D22A0066C013 /* Sapling */,
+				49D642722629D22A0066C013 /* SwiftPackageProductDependency */,
+				49D642742629D22A0066C013 /* SwiftPackageProductDependency */,
 			);
 			productName = App;
 			productReference = 504EC3041FED79650016851F /* App.app */;
@@ -248,7 +248,7 @@
 			);
 			mainGroup = 504EC2FB1FED79650016851F;
 			packageReferences = (
-				49D642712629D22A0066C013 /* XCRemoteSwiftPackageReference "airgap-sapling" */,
+				49D642712629D22A0066C013 /* RemoteSwiftPackageReference */,
 			);
 			productRefGroup = 504EC3051FED79650016851F /* Products */;
 			projectDirPath = "";
@@ -546,7 +546,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		49D642712629D22A0066C013 /* XCRemoteSwiftPackageReference "airgap-sapling" */ = {
+		49D642712629D22A0066C013 /* RemoteSwiftPackageReference */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/airgap-it/airgap-sapling";
 			requirement = {
@@ -557,14 +557,14 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		49D642722629D22A0066C013 /* SaplingFFI */ = {
+		49D642722629D22A0066C013 /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 49D642712629D22A0066C013 /* XCRemoteSwiftPackageReference "airgap-sapling" */;
+			package = 49D642712629D22A0066C013 /* RemoteSwiftPackageReference */;
 			productName = SaplingFFI;
 		};
-		49D642742629D22A0066C013 /* Sapling */ = {
+		49D642742629D22A0066C013 /* SwiftPackageProductDependency */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 49D642712629D22A0066C013 /* XCRemoteSwiftPackageReference "airgap-sapling" */;
+			package = 49D642712629D22A0066C013 /* RemoteSwiftPackageReference */;
 			productName = Sapling;
 		};
 /* End XCSwiftPackageProductDependency section */