From 4662aaedf1f9f2a94d01b54fd2a637d4c3dac63d Mon Sep 17 00:00:00 2001 From: Thomas Vidas Date: Thu, 10 Feb 2022 16:41:16 -0500 Subject: [PATCH] chore(ios): Fix iOS Portals dependency issue with 0.4.2 --- ios/Podfile | 2 + ios/Podfile.lock | 14 ++--- .../PortalsTestApp.xcodeproj/project.pbxproj | 52 ++++++++++++++++--- ios/package.json | 2 +- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 33c53ad5..cfb9c47e 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -18,9 +18,11 @@ end target 'PortalsTestApp-iOS' do project './PortalsTestApp/PortalsTestApp.xcodeproj' + capacitor_pods end target 'PortalsTestApp-macOS' do project './PortalsTestApp/PortalsTestApp.xcodeproj' + capacitor_pods end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 99b8f2f3..8e60fc35 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,8 +1,8 @@ PODS: - - Capacitor (3.4.0): + - Capacitor (3.4.1): - CapacitorCordova - - CapacitorCordova (3.4.0) - - IonicLiveUpdates (0.0.3): + - CapacitorCordova (3.4.1) + - IonicLiveUpdates (0.0.5): - ZIPFoundation - ZIPFoundation (0.9.13) @@ -19,11 +19,11 @@ SPEC REPOS: - ZIPFoundation SPEC CHECKSUMS: - Capacitor: 2c87bbfa1f4f45bec2f36deff20b1a5dd0b478c8 - CapacitorCordova: 7c01955997148ef0fc9b162198f2ae10574dc2b7 - IonicLiveUpdates: 898932e5b86ccbee1688b532a510a687ea764cb4 + Capacitor: 91a8e65669f9dc42a67b1e4ac8f24e84ee1a5910 + CapacitorCordova: 83d9d57c62689ab9887b38b71dd145680a6f7b9b + IonicLiveUpdates: f3e54dbb5a330eb820a823477c5a75cd4470b65d ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37 -PODFILE CHECKSUM: 1e07cc377403a725fedc8b829173e3c481b9f9e9 +PODFILE CHECKSUM: 907a89a8be5c1e29feeca53d7acee9e250699038 COCOAPODS: 1.11.2 diff --git a/ios/PortalsTestApp/PortalsTestApp.xcodeproj/project.pbxproj b/ios/PortalsTestApp/PortalsTestApp.xcodeproj/project.pbxproj index 5d2f4957..da18dfea 100644 --- a/ios/PortalsTestApp/PortalsTestApp.xcodeproj/project.pbxproj +++ b/ios/PortalsTestApp/PortalsTestApp.xcodeproj/project.pbxproj @@ -7,8 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 2D830140E4EAD87F3854D645 /* libPods-PortalsTestApp-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F33803B652CE5B876D77FAE /* libPods-PortalsTestApp-iOS.a */; }; - 973750CD5C86188B05045DBF /* libPods-PortalsTestApp-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD15D78E03DC696F1BAAA7E9 /* libPods-PortalsTestApp-macOS.a */; }; + 4CBEC2411B2D677D201CBDD6 /* Pods_PortalsTestApp_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EFC323D7A65471535DEF4C4 /* Pods_PortalsTestApp_iOS.framework */; }; D42DFCB027A4347800803A1A /* IonicPortals.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D42DFCAF27A4347800803A1A /* IonicPortals.framework */; }; D42DFCB127A4347800803A1A /* IonicPortals.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D42DFCAF27A4347800803A1A /* IonicPortals.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E985F816269E259D0031F820 /* PortalsTestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E985F803269E259C0031F820 /* PortalsTestApp.swift */; }; @@ -17,6 +16,7 @@ E985F819269E259D0031F820 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E985F804269E259C0031F820 /* ContentView.swift */; }; E985F81A269E259D0031F820 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E985F805269E259D0031F820 /* Assets.xcassets */; }; E985F81B269E259D0031F820 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E985F805269E259D0031F820 /* Assets.xcassets */; }; + F44EC04AC7A2EB938BB93909 /* Pods_PortalsTestApp_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C29C616A5EEDE7744C17B81A /* Pods_PortalsTestApp_macOS.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -36,11 +36,11 @@ /* Begin PBXFileReference section */ 09680184EB42C0DC6C11256E /* Pods-PortalsTestApp (iOS).debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortalsTestApp (iOS).debug.xcconfig"; path = "Target Support Files/Pods-PortalsTestApp (iOS)/Pods-PortalsTestApp (iOS).debug.xcconfig"; sourceTree = ""; }; 0E99D95CF46AC2C97E26C361 /* Pods-PortalsTestApp (iOS).release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortalsTestApp (iOS).release.xcconfig"; path = "Target Support Files/Pods-PortalsTestApp (iOS)/Pods-PortalsTestApp (iOS).release.xcconfig"; sourceTree = ""; }; + 1EFC323D7A65471535DEF4C4 /* Pods_PortalsTestApp_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PortalsTestApp_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 242A05A9C72F4F174E66F6B4 /* Pods-PortalsTestApp-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortalsTestApp-iOS.release.xcconfig"; path = "Target Support Files/Pods-PortalsTestApp-iOS/Pods-PortalsTestApp-iOS.release.xcconfig"; sourceTree = ""; }; - 4F33803B652CE5B876D77FAE /* libPods-PortalsTestApp-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PortalsTestApp-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 839961D48A24D9C7853127D8 /* Pods-PortalsTestApp-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortalsTestApp-macOS.release.xcconfig"; path = "Target Support Files/Pods-PortalsTestApp-macOS/Pods-PortalsTestApp-macOS.release.xcconfig"; sourceTree = ""; }; + C29C616A5EEDE7744C17B81A /* Pods_PortalsTestApp_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PortalsTestApp_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D42DFCAF27A4347800803A1A /* IonicPortals.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = IonicPortals.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DD15D78E03DC696F1BAAA7E9 /* libPods-PortalsTestApp-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PortalsTestApp-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E5AA69DE3B6E62FEDEB69C6A /* Pods-PortalsTestApp-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortalsTestApp-macOS.debug.xcconfig"; path = "Target Support Files/Pods-PortalsTestApp-macOS/Pods-PortalsTestApp-macOS.debug.xcconfig"; sourceTree = ""; }; E6CE48FE16C0ABC47F8B0E25 /* Pods-PortalsTestApp-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PortalsTestApp-iOS.debug.xcconfig"; path = "Target Support Files/Pods-PortalsTestApp-iOS/Pods-PortalsTestApp-iOS.debug.xcconfig"; sourceTree = ""; }; E985F803269E259C0031F820 /* PortalsTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PortalsTestApp.swift; sourceTree = ""; }; @@ -59,7 +59,7 @@ buildActionMask = 2147483647; files = ( D42DFCB027A4347800803A1A /* IonicPortals.framework in Frameworks */, - 2D830140E4EAD87F3854D645 /* libPods-PortalsTestApp-iOS.a in Frameworks */, + 4CBEC2411B2D677D201CBDD6 /* Pods_PortalsTestApp_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,7 +67,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 973750CD5C86188B05045DBF /* libPods-PortalsTestApp-macOS.a in Frameworks */, + F44EC04AC7A2EB938BB93909 /* Pods_PortalsTestApp_macOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -140,8 +140,8 @@ isa = PBXGroup; children = ( D42DFCAF27A4347800803A1A /* IonicPortals.framework */, - 4F33803B652CE5B876D77FAE /* libPods-PortalsTestApp-iOS.a */, - DD15D78E03DC696F1BAAA7E9 /* libPods-PortalsTestApp-macOS.a */, + 1EFC323D7A65471535DEF4C4 /* Pods_PortalsTestApp_iOS.framework */, + C29C616A5EEDE7744C17B81A /* Pods_PortalsTestApp_macOS.framework */, ); name = Frameworks; sourceTree = ""; @@ -159,6 +159,7 @@ E985F808269E259D0031F820 /* Resources */, D42DFCAE27A4346E00803A1A /* Embed Frameworks */, D42DFCB227A4388B00803A1A /* Copy Web App */, + B01E6D3E51F68FEA8DF5657A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -177,6 +178,7 @@ E985F80E269E259D0031F820 /* Sources */, E985F80F269E259D0031F820 /* Frameworks */, E985F810269E259D0031F820 /* Resources */, + C06D1B4F2A520E90247F6753 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -265,6 +267,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + B01E6D3E51F68FEA8DF5657A /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PortalsTestApp-iOS/Pods-PortalsTestApp-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PortalsTestApp-iOS/Pods-PortalsTestApp-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PortalsTestApp-iOS/Pods-PortalsTestApp-iOS-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; BCACE021CA60136C0EE26EEE /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -287,6 +306,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + C06D1B4F2A520E90247F6753 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PortalsTestApp-macOS/Pods-PortalsTestApp-macOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-PortalsTestApp-macOS/Pods-PortalsTestApp-macOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PortalsTestApp-macOS/Pods-PortalsTestApp-macOS-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; D42DFCB227A4388B00803A1A /* Copy Web App */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/ios/package.json b/ios/package.json index 4a3a7498..8d6ae52c 100644 --- a/ios/package.json +++ b/ios/package.json @@ -1,6 +1,6 @@ { "name": "ionic-portals-ios", - "version": "0.4.1", + "version": "0.4.2", "description": "Ionic Portals", "homepage": "https://ionic.io/portals", "author": "Ionic Team (https://ionic.io)",