From 3a5f1f1d5f8869a3a1680ba56cdece97892965f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gon=C3=A7alves?= Date: Tue, 17 Oct 2023 16:25:19 -0300 Subject: [PATCH 1/3] fix: bump tikisdk 3.0.0 --- README.md | 4 +- .../ios/App/App.xcodeproj/project.pbxproj | 64 +++++++++---------- example/vue2/ios/App/Podfile | 4 +- example/vue2/ios/App/Podfile.lock | 22 +++---- example/vue2/package-lock.json | 12 ++-- example/vue2/package.json | 2 +- example/vue3/ios/App/Podfile | 4 +- example/vue3/package.json | 2 +- makefile | 2 + vue2/package.json | 4 +- vue3/package.json | 2 +- 11 files changed, 62 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index 9dda5a0..845b63d 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,8 @@ target do pod 'BlinkReceipt', '~> 1.39' pod 'BlinkEReceipt', '~> 2.31' - pod 'TikiSdkRelease', '2.1.10', :configurations => 'Release' - pod 'TikiSdkDebug', '2.1.10', :configurations => 'Debug' + pod 'TikiSdkRelease', '3.0.0', :configurations => 'Release' + pod 'TikiSdkDebug', '3.0.0', :configurations => 'Debug' end ``` diff --git a/example/vue2/ios/App/App.xcodeproj/project.pbxproj b/example/vue2/ios/App/App.xcodeproj/project.pbxproj index b6a7ee6..c668461 100644 --- a/example/vue2/ios/App/App.xcodeproj/project.pbxproj +++ b/example/vue2/ios/App/App.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 2F2F19247281CA87FFA5FC10 /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7CB137CB38B3979413404A /* Pods_App.framework */; }; 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; }; 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; @@ -14,11 +15,11 @@ 504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; }; 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; - 9A2CD42EB4FC1D831D8E2DDE /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC25466F46DD9826B69AD049 /* Pods_App.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; + 4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; 504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -27,9 +28,8 @@ 504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = ""; }; - 764261C7588CB2DD520979D5 /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; - 95B6615D0B6A8C6520433239 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; - DC25466F46DD9826B69AD049 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; + AA7CB137CB38B3979413404A /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -37,7 +37,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9A2CD42EB4FC1D831D8E2DDE /* Pods_App.framework in Frameworks */, + 2F2F19247281CA87FFA5FC10 /* Pods_App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -49,8 +49,8 @@ children = ( 504EC3061FED79650016851F /* App */, 504EC3051FED79650016851F /* Products */, - CC3C62932352AE3DBB1E3ECC /* Pods */, - D2496E952483A21AEB190455 /* Frameworks */, + D14F9ED3BAA0525FAC377155 /* Pods */, + 885466630CB0850C47639EB7 /* Frameworks */, ); sourceTree = ""; }; @@ -77,22 +77,22 @@ path = App; sourceTree = ""; }; - CC3C62932352AE3DBB1E3ECC /* Pods */ = { + 885466630CB0850C47639EB7 /* Frameworks */ = { isa = PBXGroup; children = ( - 764261C7588CB2DD520979D5 /* Pods-App.debug.xcconfig */, - 95B6615D0B6A8C6520433239 /* Pods-App.release.xcconfig */, + AA7CB137CB38B3979413404A /* Pods_App.framework */, ); - name = Pods; - path = Pods; + name = Frameworks; sourceTree = ""; }; - D2496E952483A21AEB190455 /* Frameworks */ = { + D14F9ED3BAA0525FAC377155 /* Pods */ = { isa = PBXGroup; children = ( - DC25466F46DD9826B69AD049 /* Pods_App.framework */, + 4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */, + A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */, ); - name = Frameworks; + name = Pods; + path = Pods; sourceTree = ""; }; /* End PBXGroup section */ @@ -102,11 +102,11 @@ isa = PBXNativeTarget; buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */; buildPhases = ( - D3AC0867514B9957338AD452 /* [CP] Check Pods Manifest.lock */, + 085FBC45B2329240D8C19897 /* [CP] Check Pods Manifest.lock */, 504EC3001FED79650016851F /* Sources */, 504EC3011FED79650016851F /* Frameworks */, 504EC3021FED79650016851F /* Resources */, - 02401EC8218129B5121937DA /* [CP] Embed Pods Frameworks */, + DB1CB402EB6BBB06B1B396B8 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -168,41 +168,41 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 02401EC8218129B5121937DA /* [CP] Embed Pods Frameworks */ = { + 085FBC45B2329240D8C19897 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; + 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; }; - D3AC0867514B9957338AD452 /* [CP] Check Pods Manifest.lock */ = { + DB1CB402EB6BBB06B1B396B8 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( ); + name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -347,7 +347,7 @@ }; 504EC3171FED79650016851F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 764261C7588CB2DD520979D5 /* Pods-App.debug.xcconfig */; + baseConfigurationReference = 4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -368,7 +368,7 @@ }; 504EC3181FED79650016851F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 95B6615D0B6A8C6520433239 /* Pods-App.release.xcconfig */; + baseConfigurationReference = A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; diff --git a/example/vue2/ios/App/Podfile b/example/vue2/ios/App/Podfile index c6b2f58..d25a0ba 100644 --- a/example/vue2/ios/App/Podfile +++ b/example/vue2/ios/App/Podfile @@ -25,8 +25,8 @@ target 'App' do pod 'BlinkReceipt', '~> 1.39' pod 'BlinkEReceipt', '~> 2.31' - pod 'TikiSdkRelease', '2.1.10', :configurations => 'Release' - pod 'TikiSdkDebug', '2.1.10', :configurations => 'Debug' + pod 'TikiSdkRelease', '3.0.0', :configurations => 'Release' + pod 'TikiSdkDebug', '3.0.0', :configurations => 'Debug' end post_install do |installer| diff --git a/example/vue2/ios/App/Podfile.lock b/example/vue2/ios/App/Podfile.lock index ed342e7..3092abc 100644 --- a/example/vue2/ios/App/Podfile.lock +++ b/example/vue2/ios/App/Podfile.lock @@ -59,12 +59,12 @@ PODS: - BlinkEReceipt - BlinkReceipt - Capacitor - - MytikiTikiSdkCapacitor (0.3.5): + - MytikiTikiSdkCapacitor (0.3.6): - Capacitor - - TikiSdkDebug (= 2.1.10) - - TikiSdkRelease (= 2.1.10) - - TikiSdkDebug (2.1.10) - - TikiSdkRelease (2.1.10) + - TikiSdkDebug (= 3.0.0) + - TikiSdkRelease (= 3.0.0) + - TikiSdkDebug (3.0.0) + - TikiSdkRelease (3.0.0) DEPENDENCIES: - BlinkEReceipt (~> 2.31) @@ -75,8 +75,8 @@ DEPENDENCIES: - "CapacitorPreferences (from `../../node_modules/@capacitor/preferences`)" - "MytikiCaptureReceiptCapacitor (from `../../node_modules/@mytiki/capture-receipt-capacitor`)" - "MytikiTikiSdkCapacitor (from `../../node_modules/@mytiki/tiki-sdk-capacitor`)" - - TikiSdkDebug (= 2.1.10) - - TikiSdkRelease (= 2.1.10) + - TikiSdkDebug (= 3.0.0) + - TikiSdkRelease (= 3.0.0) SPEC REPOS: https://github.com/BlinkReceipt/PodSpecRepo.git: @@ -130,10 +130,10 @@ SPEC CHECKSUMS: MSGraphClientModels: ffef6d0a1cdaa774e1689e38da35301cb74fc72a MSGraphClientSDK: ffc07a58a838e0702c7bf2a856367035d4a335d7 MytikiCaptureReceiptCapacitor: 66191a513ac58e6b553e1979d24816cea1c96960 - MytikiTikiSdkCapacitor: 463ef5489d441aef6a6effc97f2daf0f305579a1 - TikiSdkDebug: a84070ecc0a826c2cdde3e926c8d70021df52f5a - TikiSdkRelease: 075117d8873b89db71950dec9b8bb9da69cd34a6 + MytikiTikiSdkCapacitor: 258f609e4acb6d92f8f510dd84b95f517a760dc9 + TikiSdkDebug: 85a41ce306804d45014345fb12ed4f34b83defe0 + TikiSdkRelease: 5979b718bf1776d1d9e66fbd503aed531f9e4d0d -PODFILE CHECKSUM: d31d91c3f41e6c0eab69680e0de2ce07dd150353 +PODFILE CHECKSUM: 2695f0285861bb027b36eacb75ee77e7eab90f73 COCOAPODS: 1.12.1 diff --git a/example/vue2/package-lock.json b/example/vue2/package-lock.json index f8422a6..31bf6ea 100644 --- a/example/vue2/package-lock.json +++ b/example/vue2/package-lock.json @@ -16,7 +16,7 @@ "@capacitor/preferences": "^5.0.6", "@mytiki/capture-receipt-capacitor": "^0.7.0", "@mytiki/receipt-capacitor-vue2": "file:../../", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "uuid": "^9.0.0", "vite": "^4.4.10", "vue": "^2.7.14" @@ -48,7 +48,7 @@ "@capacitor/local-notifications": "^5.0.6", "@capacitor/preferences": "^5.0.6", "@mytiki/capture-receipt-capacitor": "^0.7.1", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "showdown": "^2.1.0", "vue": "2.7.14" }, @@ -88,7 +88,7 @@ "@capacitor/local-notifications": "^5.0.0", "@capacitor/preferences": "^5.0.0", "@mytiki/capture-receipt-capacitor": "^0.7.1", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "vue": "^3.0.0" } }, @@ -777,9 +777,9 @@ "link": true }, "node_modules/@mytiki/tiki-sdk-capacitor": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@mytiki/tiki-sdk-capacitor/-/tiki-sdk-capacitor-0.3.5.tgz", - "integrity": "sha512-qNViZoF43bv96/EaC72uion5mof3p9JoOetXZsbtGyRE5a8HTlfffD1kD7WElDM3IqrsPgWwhMnjtGilxnD4MA==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@mytiki/tiki-sdk-capacitor/-/tiki-sdk-capacitor-0.3.6.tgz", + "integrity": "sha512-AHqu6JfdKm8y3RE8eNgu2AFn1RTLhycWNg0d7cPwes9aDPyHtPORt9vnlZUSd/iHxiHyacTTVBGbZh3qjQmCIg==", "peerDependencies": { "@capacitor/android": "^5.4.1", "@capacitor/core": "^5.4.1", diff --git a/example/vue2/package.json b/example/vue2/package.json index 1f2ea7e..8167d1a 100644 --- a/example/vue2/package.json +++ b/example/vue2/package.json @@ -20,7 +20,7 @@ "@capacitor/preferences": "^5.0.6", "@mytiki/capture-receipt-capacitor": "^0.7.0", "@mytiki/receipt-capacitor-vue2": "file:../../", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "uuid": "^9.0.0", "vite": "^4.4.10", "vue": "^2.7.14" diff --git a/example/vue3/ios/App/Podfile b/example/vue3/ios/App/Podfile index 1524ac1..175e32d 100644 --- a/example/vue3/ios/App/Podfile +++ b/example/vue3/ios/App/Podfile @@ -24,8 +24,8 @@ target 'App' do pod 'BlinkReceipt', '~> 1.39' pod 'BlinkEReceipt', '~> 2.31' - pod 'TikiSdkRelease', '2.1.10', :configurations => 'Release' - pod 'TikiSdkDebug', '2.1.10', :configurations => 'Debug' + pod 'TikiSdkRelease', '3.0.0', :configurations => 'Release' + pod 'TikiSdkDebug', '3.0.0', :configurations => 'Debug' end post_install do |installer| diff --git a/example/vue3/package.json b/example/vue3/package.json index d6557d6..b5d6d86 100644 --- a/example/vue3/package.json +++ b/example/vue3/package.json @@ -17,7 +17,7 @@ "@capacitor/core": "^5.4.1", "@capacitor/ios": "^5.4.1", "@mytiki/capture-receipt-capacitor": "^0.7.1", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "@mytiki/receipt-capacitor": "file:../../", "@capacitor/preferences": "^5.0.6", "@capacitor/local-notifications": "^5.0.6", diff --git a/makefile b/makefile index 12ab0bf..f77de50 100644 --- a/makefile +++ b/makefile @@ -22,6 +22,7 @@ vue3-example-android: vue3-example cd example/vue3 && npx cap run android vue3-example-ios: vue3-example + cd example/vue3/ios/App pod deintegrate cd example/vue3/ios/App pod install --repo-update cd example/vue3 && npx cap run ios @@ -41,6 +42,7 @@ vue2-example-android: vue2-example cd example/vue2 && npx cap run android vue2-example-ios: vue2-example + cd example/vue2/ios/App pod deintegrate cd example/vue2/ios/App pod install --repo-update cd example/vue2 && npx cap run ios diff --git a/vue2/package.json b/vue2/package.json index 7c06f6a..5827515 100644 --- a/vue2/package.json +++ b/vue2/package.json @@ -38,7 +38,7 @@ "@capacitor/preferences": "^5.0.6", "@capacitor/local-notifications": "^5.0.6", "@mytiki/capture-receipt-capacitor": "^0.7.1", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "vue": "2.7.14", "showdown": "^2.1.0" }, @@ -78,7 +78,7 @@ "@capacitor/preferences": "^5.0.0", "@capacitor/local-notifications": "^5.0.0", "@mytiki/capture-receipt-capacitor": "^0.7.1", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "vue": "^3.0.0" } } diff --git a/vue3/package.json b/vue3/package.json index 9377957..5009519 100644 --- a/vue3/package.json +++ b/vue3/package.json @@ -77,7 +77,7 @@ "@capacitor/ios": "^5.4.0", "@capacitor/preferences": "^5.0.0", "@mytiki/capture-receipt-capacitor": "^0.7.1", - "@mytiki/tiki-sdk-capacitor": "^0.3.5", + "@mytiki/tiki-sdk-capacitor": "^0.3.6", "vue": "^3.0.0" } } From 4a2742ababedecdf0be7af184fe8cd2606bb3fd4 Mon Sep 17 00:00:00 2001 From: GH Action Date: Tue, 17 Oct 2023 19:30:15 +0000 Subject: [PATCH 2/3] version bump --- vue2/package.json | 2 +- vue3/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vue2/package.json b/vue2/package.json index 5827515..1ff6f52 100644 --- a/vue2/package.json +++ b/vue2/package.json @@ -1,6 +1,6 @@ { "name": "@mytiki/receipt-capacitor-vue2", - "version": "0.5.2", + "version": "0.5.3", "description": "The TIKI Receipt library adds to your Vue.js + Capacitor **mobile app** a Data Reward program for your users to share their receipts in-exchange for **cash from Tiki inc**.", "author": "Tiki inc.", "license": "MIT", diff --git a/vue3/package.json b/vue3/package.json index 5009519..971182d 100644 --- a/vue3/package.json +++ b/vue3/package.json @@ -1,6 +1,6 @@ { "name": "@mytiki/receipt-capacitor", - "version": "0.5.2", + "version": "0.5.3", "description": "The TIKI Receipt library adds to your Vue.js + Capacitor **mobile app** a Data Reward program for your users to share their receipts in-exchange for **cash from Tiki inc**.", "author": "Tiki inc.", "license": "MIT", From a2df4d555f1e19658c4990e9a19fbc9e351062aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gon=C3=A7alves?= Date: Tue, 17 Oct 2023 21:53:21 -0300 Subject: [PATCH 3/3] fix: missing && in makefile --- .../ios/App/App.xcodeproj/project.pbxproj | 64 +++++++++---------- example/vue2/package-lock.json | 2 +- makefile | 8 +-- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/example/vue2/ios/App/App.xcodeproj/project.pbxproj b/example/vue2/ios/App/App.xcodeproj/project.pbxproj index c668461..1a2a425 100644 --- a/example/vue2/ios/App/App.xcodeproj/project.pbxproj +++ b/example/vue2/ios/App/App.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 2F2F19247281CA87FFA5FC10 /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA7CB137CB38B3979413404A /* Pods_App.framework */; }; 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; }; 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; @@ -15,11 +14,11 @@ 504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; }; 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; + E4E5024D2579EAC521E8D0D8 /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BA32F966DEB60C35333DA7 /* Pods_App.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; - 4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; 504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -28,8 +27,9 @@ 504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = ""; }; - A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; - AA7CB137CB38B3979413404A /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; + B6BA32F966DEB60C35333DA7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -37,7 +37,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2F2F19247281CA87FFA5FC10 /* Pods_App.framework in Frameworks */, + E4E5024D2579EAC521E8D0D8 /* Pods_App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -49,8 +49,8 @@ children = ( 504EC3061FED79650016851F /* App */, 504EC3051FED79650016851F /* Products */, - D14F9ED3BAA0525FAC377155 /* Pods */, - 885466630CB0850C47639EB7 /* Frameworks */, + C0A8645BD60FBB5580CCD625 /* Pods */, + F02A3D7C5F31281E05AADBE3 /* Frameworks */, ); sourceTree = ""; }; @@ -77,22 +77,22 @@ path = App; sourceTree = ""; }; - 885466630CB0850C47639EB7 /* Frameworks */ = { + C0A8645BD60FBB5580CCD625 /* Pods */ = { isa = PBXGroup; children = ( - AA7CB137CB38B3979413404A /* Pods_App.framework */, + C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */, + 568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */, ); - name = Frameworks; + name = Pods; + path = Pods; sourceTree = ""; }; - D14F9ED3BAA0525FAC377155 /* Pods */ = { + F02A3D7C5F31281E05AADBE3 /* Frameworks */ = { isa = PBXGroup; children = ( - 4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */, - A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */, + B6BA32F966DEB60C35333DA7 /* Pods_App.framework */, ); - name = Pods; - path = Pods; + name = Frameworks; sourceTree = ""; }; /* End PBXGroup section */ @@ -102,11 +102,11 @@ isa = PBXNativeTarget; buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */; buildPhases = ( - 085FBC45B2329240D8C19897 /* [CP] Check Pods Manifest.lock */, + 9A7B00240E3692B9D7D8B7B1 /* [CP] Check Pods Manifest.lock */, 504EC3001FED79650016851F /* Sources */, 504EC3011FED79650016851F /* Frameworks */, 504EC3021FED79650016851F /* Resources */, - DB1CB402EB6BBB06B1B396B8 /* [CP] Embed Pods Frameworks */, + 520A4ADEA6D9F05D8FE9CE7B /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -168,41 +168,41 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 085FBC45B2329240D8C19897 /* [CP] Check Pods Manifest.lock */ = { + 520A4ADEA6D9F05D8FE9CE7B /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( ); + name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - DB1CB402EB6BBB06B1B396B8 /* [CP] Embed Pods Frameworks */ = { + 9A7B00240E3692B9D7D8B7B1 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( ); - name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; + 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; }; /* End PBXShellScriptBuildPhase section */ @@ -347,7 +347,7 @@ }; 504EC3171FED79650016851F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4DEC218A73E6AD413A431218 /* Pods-App.debug.xcconfig */; + baseConfigurationReference = C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -368,7 +368,7 @@ }; 504EC3181FED79650016851F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A4C02A64FDDEF59F6786A0BA /* Pods-App.release.xcconfig */; + baseConfigurationReference = 568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; diff --git a/example/vue2/package-lock.json b/example/vue2/package-lock.json index 31bf6ea..436d096 100644 --- a/example/vue2/package-lock.json +++ b/example/vue2/package-lock.json @@ -42,7 +42,7 @@ }, "../..": { "name": "@mytiki/receipt-capacitor-vue2", - "version": "0.5.2", + "version": "0.5.3", "license": "MIT", "dependencies": { "@capacitor/local-notifications": "^5.0.6", diff --git a/makefile b/makefile index f77de50..8c87d1c 100644 --- a/makefile +++ b/makefile @@ -22,8 +22,8 @@ vue3-example-android: vue3-example cd example/vue3 && npx cap run android vue3-example-ios: vue3-example - cd example/vue3/ios/App pod deintegrate - cd example/vue3/ios/App pod install --repo-update + cd example/vue3/ios/App && pod deintegrate + cd example/vue3/ios/App && pod install --repo-update cd example/vue3 && npx cap run ios vue2: clean @@ -42,8 +42,8 @@ vue2-example-android: vue2-example cd example/vue2 && npx cap run android vue2-example-ios: vue2-example - cd example/vue2/ios/App pod deintegrate - cd example/vue2/ios/App pod install --repo-update + cd example/vue2/ios/App && pod deintegrate + cd example/vue2/ios/App && pod install --repo-update cd example/vue2 && npx cap run ios clean: