Merge pull request #308 from tiki/release/upgrade-sdk-capacitor

release: 0.5.0

README.md

@@ -43,7 +43,12 @@ Next, if you don't already have a `publishingId` from TIKI, **create a free acco
 Microblink is closed source, and subsequently it's AARs are hosted by Microblink's Maven repository, not Maven Central. You need to add the maven endpoint to your `android/build.gradle` file in your project's android folder.
 
 ```groovy
-maven { url  "https://maven.microblink.com" }
+allprojects {
+  repositories {
+    // other repositories
+    maven { url  "https://maven.microblink.com" }
+  }
+}
 ```
 
 Depending on your project's configuration you may also need to add the following `packagingOptions` to your `android/app/build.gradle` file.
@@ -63,10 +68,9 @@ android {
 #### iOS
 To build for iOS using Cocoapods, add the Tiki and Microblink PodspecRepos to your `ios/App/Podfile`. Then include the dependencies.
 
-1. Add the TikiSdk and BlinkReceipt repositories at the top of the Podfile.
+1. Add the BlinkReceipt repository at the top of the Podfile.
 
 ```
-source 'https://github.com/tiki/PodspecRepo.git'
 source 'https://github.com/BlinkReceipt/PodSpecRepo.git'
 source 'https://cdn.cocoapods.org/'
 ```
@@ -79,7 +83,7 @@ target <TARGET> do
 
   pod 'BlinkReceipt', '~> 1.39'
   pod 'BlinkEReceipt', '~> 2.31'
-  pod 'TikiSdk', '~> 2.1.0'
+  pod 'TikiSdk', '~> 2.1.8'
 end
 ```
 

example/vue2/android/variables.gradle

@@ -1,7 +1,7 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 34
-    targetSdkVersion = 34
+    compileSdkVersion = 33
+    targetSdkVersion = 33
     androidxActivityVersion = '1.7.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'

example/vue2/ios/App/App.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 		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 */; };
-		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
+		9A2CD42EB4FC1D831D8E2DDE /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC25466F46DD9826B69AD049 /* Pods_App.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,38 +27,30 @@
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
-		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
-		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
+		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 = "<group>"; };
+		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 = "<group>"; };
+		DC25466F46DD9826B69AD049 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		504EC3011FED79650016851F /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
+				9A2CD42EB4FC1D831D8E2DDE /* Pods_App.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 		504EC2FB1FED79650016851F = {
 			isa = PBXGroup;
 			children = (
 				504EC3061FED79650016851F /* App */,
 				504EC3051FED79650016851F /* Products */,
-				7F8756D8B27F46E3366F6CEA /* Pods */,
-				27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
+				CC3C62932352AE3DBB1E3ECC /* Pods */,
+				D2496E952483A21AEB190455 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -85,13 +77,22 @@
 			path = App;
 			sourceTree = "<group>";
 		};
-		7F8756D8B27F46E3366F6CEA /* Pods */ = {
+		CC3C62932352AE3DBB1E3ECC /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
-				AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
+				764261C7588CB2DD520979D5 /* Pods-App.debug.xcconfig */,
+				95B6615D0B6A8C6520433239 /* Pods-App.release.xcconfig */,
 			);
 			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
+		D2496E952483A21AEB190455 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				DC25466F46DD9826B69AD049 /* Pods_App.framework */,
+			);
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -101,11 +102,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
 			buildPhases = (
-				6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
+				D3AC0867514B9957338AD452 /* [CP] Check Pods Manifest.lock */,
 				504EC3001FED79650016851F /* Sources */,
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
-				9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
+				02401EC8218129B5121937DA /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -167,37 +168,41 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
+		02401EC8218129B5121937DA /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			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;
 		};
-		9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
+		D3AC0867514B9957338AD452 /* [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 */
@@ -342,7 +347,7 @@
 		};
 		504EC3171FED79650016851F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
+			baseConfigurationReference = 764261C7588CB2DD520979D5 /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
@@ -363,7 +368,7 @@
 		};
 		504EC3181FED79650016851F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
+			baseConfigurationReference = 95B6615D0B6A8C6520433239 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;

example/vue2/ios/App/Podfile

@@ -1,4 +1,3 @@
-source 'https://github.com/tiki/PodspecRepo.git'
 source 'https://github.com/BlinkReceipt/PodSpecRepo.git'
 source 'https://cdn.cocoapods.org/'
 
@@ -25,7 +24,7 @@ target 'App' do
 
   pod 'BlinkReceipt', '~> 1.39'
   pod 'BlinkEReceipt', '~> 2.31'
-  pod 'TikiSdk', '~> 2.1.1'
+  pod 'TikiSdk', '~> 2.1.8'
 end
 
 post_install do |installer|

example/vue2/ios/App/Podfile.lock

@@ -57,10 +57,10 @@ PODS:
     - BlinkEReceipt
     - BlinkReceipt
     - Capacitor
-  - MytikiTikiSdkCapacitor (0.3.3):
+  - MytikiTikiSdkCapacitor (0.3.4):
     - Capacitor
     - TikiSdk
-  - TikiSdk (2.1.1)
+  - TikiSdk (2.1.7)
 
 DEPENDENCIES:
   - BlinkEReceipt (~> 2.31)
@@ -70,7 +70,7 @@ DEPENDENCIES:
   - "CapacitorPreferences (from `../../node_modules/@capacitor/preferences`)"
   - "MytikiCaptureReceiptCapacitor (from `../../node_modules/@mytiki/capture-receipt-capacitor`)"
   - "MytikiTikiSdkCapacitor (from `../../node_modules/@mytiki/tiki-sdk-capacitor`)"
-  - TikiSdk (~> 2.1.1)
+  - TikiSdk (~> 2.1.7)
 
 SPEC REPOS:
   https://github.com/BlinkReceipt/PodSpecRepo.git:
@@ -79,8 +79,6 @@ SPEC REPOS:
     - BlinkReceipt
     - BRMailCore
     - BRMSGraphMSALAuthProvider
-  https://github.com/tiki/PodspecRepo.git:
-    - TikiSdk
   trunk:
     - AppAuth
     - GoogleAPIClientForREST
@@ -90,6 +88,7 @@ SPEC REPOS:
     - MSAL
     - MSGraphClientModels
     - MSGraphClientSDK
+    - TikiSdk
 
 EXTERNAL SOURCES:
   Capacitor:
@@ -121,9 +120,9 @@ SPEC CHECKSUMS:
   MSGraphClientModels: ffef6d0a1cdaa774e1689e38da35301cb74fc72a
   MSGraphClientSDK: ffc07a58a838e0702c7bf2a856367035d4a335d7
   MytikiCaptureReceiptCapacitor: a9c1d0d8417e5f16442e826bf1bd0bc63a1a44f2
-  MytikiTikiSdkCapacitor: b15b0d62f44b4aa79615d957fac2ec6e1130d4d2
-  TikiSdk: 0b3c67d6780316766c3bee9a89102c27f3b400aa
+  MytikiTikiSdkCapacitor: 75b8f2efabb495b57f8aaf6935fa9df483fb6ffe
+  TikiSdk: e252bf10c55972064be06203e9e750a6d621d317
 
-PODFILE CHECKSUM: 099bdebcb302ad1c1a6479c44fb44dd444f30c2d
+PODFILE CHECKSUM: 04850845c7031232988d6bc8672b2cd96dd2846b
 
 COCOAPODS: 1.12.1

example/vue2/package.json

@@ -16,10 +16,10 @@
     "@capacitor/android": "^5.4.2",
     "@capacitor/core": "latest",
     "@capacitor/ios": "^5.4.2",
-    "@capacitor/preferences": "^5.0.6",    
-    "@mytiki/capture-receipt-capacitor": "^0.7.0",
+    "@capacitor/preferences": "^5.0.6",
+    "@mytiki/capture-receipt-capacitor": "^0.7.1",
     "@mytiki/receipt-capacitor-vue2": "file:../../",
-    "@mytiki/tiki-sdk-capacitor": "^0.3.3",
+    "@mytiki/tiki-sdk-capacitor": "^0.3.4",
     "uuid": "^9.0.0",
     "vite": "^4.4.10",
     "vue": "^2.7.14"

example/vue3/android/variables.gradle

@@ -1,7 +1,7 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 34
-    targetSdkVersion = 34
+    compileSdkVersion = 33
+    targetSdkVersion = 33
     androidxActivityVersion = '1.7.0'
     androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'
@@ -13,4 +13,4 @@ ext {
     androidxJunitVersion = '1.1.5'
     androidxEspressoCoreVersion = '3.5.1'
     cordovaAndroidVersion = '10.1.1'
-}
+}

example/vue3/ios/App/Podfile

@@ -1,4 +1,3 @@
-source 'https://github.com/tiki/PodspecRepo.git'
 source 'https://github.com/BlinkReceipt/PodSpecRepo.git'
 source 'https://cdn.cocoapods.org/'
 
@@ -25,7 +24,7 @@ target 'App' do
 
   pod 'BlinkReceipt', '~> 1.39'
   pod 'BlinkEReceipt', '~> 2.31'
-  pod 'TikiSdk', '~> 2.1.1'
+  pod 'TikiSdk', '~> 2.1.8'
 end
 
 post_install do |installer|

example/vue3/package.json

@@ -16,8 +16,8 @@
     "@capacitor/android": "^5.3.0",
     "@capacitor/core": "^5.4.1",
     "@capacitor/ios": "^5.4.1",
-    "@mytiki/capture-receipt-capacitor": "^0.7.0",
-    "@mytiki/tiki-sdk-capacitor": "^0.3.3",
+    "@mytiki/capture-receipt-capacitor": "^0.7.1",
+    "@mytiki/tiki-sdk-capacitor": "^0.3.4",
     "@mytiki/receipt-capacitor": "file:../../",
     "@capacitor/preferences": "^5.0.6",
     "uuid": "^9.0.0",

src/service/tiki-service/index.ts

@@ -9,7 +9,7 @@ import { InternalHandlers } from "@/service/tiki-service/internal-handlers";
 import { Capture } from "@/service/capture";
 import { Store } from "@/service/store";
 import { Publish } from "@/service/publish";
-import type { InjectionKey } from "vue/types/v3-generated";
+import type { InjectionKey } from "vue";
 import * as Keys from "@/utils/inject-key";
 
 /**