Merge pull request #327 from tiki/fix/ios-configs

Fix: ios config
tiki-deprecated · Oct 16, 2023 · 389c59b · 389c59b
2 parents fff4099 + cb07a70
commit 389c59b
Show file tree

Hide file tree

Showing 21 changed files with 8,478 additions and 2,679 deletions.
diff --git a/example/vue2/.eslintrc b/example/vue2/.eslintrc
@@ -15,7 +15,7 @@
     "parser": "@typescript-eslint/parser",
     "sourceType": "module",
     "ecmaVersion": "latest",
-    "project": ["./tsconfig.app.json"],
+    "project": ["./tsconfig.json"],
     "extraFileExtensions": [ ".vue" ]
   },
   "rules": {

diff --git a/example/vue2/android/app/capacitor.build.gradle b/example/vue2/android/app/capacitor.build.gradle
@@ -9,6 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-local-notifications')
     implementation project(':capacitor-preferences')
     implementation project(':mytiki-capture-receipt-capacitor')
     implementation project(':mytiki-tiki-sdk-capacitor')

diff --git a/example/vue2/android/capacitor.settings.gradle b/example/vue2/android/capacitor.settings.gradle
@@ -2,6 +2,9 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
+include ':capacitor-local-notifications'
+project(':capacitor-local-notifications').projectDir = new File('../node_modules/@capacitor/local-notifications/android')
+
 include ':capacitor-preferences'
 project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
 

diff --git a/example/vue2/ios/App/Podfile b/example/vue2/ios/App/Podfile
@@ -14,17 +14,19 @@ install! 'cocoapods', :disable_input_output_paths => true
 def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorLocalNotifications', :path => '../../node_modules/@capacitor/local-notifications'
   pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
   pod 'MytikiCaptureReceiptCapacitor', :path => '../../node_modules/@mytiki/capture-receipt-capacitor'
   pod 'MytikiTikiSdkCapacitor', :path => '../../node_modules/@mytiki/tiki-sdk-capacitor'
 end
 
 target 'App' do
   capacitor_pods
-    
+
   pod 'BlinkReceipt', '~> 1.39'
   pod 'BlinkEReceipt', '~> 2.31'
-  pod 'TikiSdk', '~> 2.1.8'
+  pod 'TikiSdkRelease', '2.1.10', :configurations => 'Release'
+  pod 'TikiSdkDebug', '2.1.10', :configurations => 'Debug'
 end
 
 post_install do |installer|

diff --git a/example/vue2/ios/App/Podfile.lock b/example/vue2/ios/App/Podfile.lock
@@ -24,6 +24,8 @@ PODS:
   - Capacitor (5.4.2):
     - CapacitorCordova
   - CapacitorCordova (5.4.2)
+  - CapacitorLocalNotifications (5.0.6):
+    - Capacitor
   - CapacitorPreferences (5.0.6):
     - Capacitor
   - GoogleAPIClientForREST/Core (1.7.0):
@@ -57,20 +59,24 @@ PODS:
     - BlinkEReceipt
     - BlinkReceipt
     - Capacitor
-  - MytikiTikiSdkCapacitor (0.3.4):
+  - MytikiTikiSdkCapacitor (0.3.5):
     - Capacitor
-    - TikiSdk
-  - TikiSdk (2.1.8)
+    - TikiSdkDebug (= 2.1.10)
+    - TikiSdkRelease (= 2.1.10)
+  - TikiSdkDebug (2.1.10)
+  - TikiSdkRelease (2.1.10)
 
 DEPENDENCIES:
   - BlinkEReceipt (~> 2.31)
   - BlinkReceipt (~> 1.39)
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
+  - "CapacitorLocalNotifications (from `../../node_modules/@capacitor/local-notifications`)"
   - "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.8)
+  - TikiSdkDebug (= 2.1.10)
+  - TikiSdkRelease (= 2.1.10)
 
 SPEC REPOS:
   https://github.com/BlinkReceipt/PodSpecRepo.git:
@@ -88,13 +94,16 @@ SPEC REPOS:
     - MSAL
     - MSGraphClientModels
     - MSGraphClientSDK
-    - TikiSdk
+    - TikiSdkDebug
+    - TikiSdkRelease
 
 EXTERNAL SOURCES:
   Capacitor:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
+  CapacitorLocalNotifications:
+    :path: "../../node_modules/@capacitor/local-notifications"
   CapacitorPreferences:
     :path: "../../node_modules/@capacitor/preferences"
   MytikiCaptureReceiptCapacitor:
@@ -111,6 +120,7 @@ SPEC CHECKSUMS:
   BRMSGraphMSALAuthProvider: 62676b8660c31a81e457e3bee0c7145d10601efd
   Capacitor: 8a9db42d105f55843cd8ed2a3cb54e2b78e7f102
   CapacitorCordova: cfcc06b698481da655415985eeb2b8da363f8451
+  CapacitorLocalNotifications: c2d8b14794064fd4814b1d6c4ddbac8029afa295
   CapacitorPreferences: f03954bcb0ff09c792909e46bff88e3183c16b10
   GoogleAPIClientForREST: 2d4140915e2ec6d1bcb39c9df4a534c75706c595
   GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a
@@ -120,9 +130,10 @@ SPEC CHECKSUMS:
   MSGraphClientModels: ffef6d0a1cdaa774e1689e38da35301cb74fc72a
   MSGraphClientSDK: ffc07a58a838e0702c7bf2a856367035d4a335d7
   MytikiCaptureReceiptCapacitor: 66191a513ac58e6b553e1979d24816cea1c96960
-  MytikiTikiSdkCapacitor: 75b8f2efabb495b57f8aaf6935fa9df483fb6ffe
-  TikiSdk: e86997e6268f8d1f765d4e43f61ce241b1124d0c
+  MytikiTikiSdkCapacitor: 463ef5489d441aef6a6effc97f2daf0f305579a1
+  TikiSdkDebug: a84070ecc0a826c2cdde3e926c8d70021df52f5a
+  TikiSdkRelease: 075117d8873b89db71950dec9b8bb9da69cd34a6
 
-PODFILE CHECKSUM: 4adb8145cd5fe051c144b19e8f8f2fe399efeb5f
+PODFILE CHECKSUM: d31d91c3f41e6c0eab69680e0de2ce07dd150353
 
 COCOAPODS: 1.12.1
diff --git a/example/vue2/package-lock.json b/example/vue2/package-lock.json
diff --git 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.4",
+    "@mytiki/tiki-sdk-capacitor": "^0.3.5",
     "uuid": "^9.0.0",
     "vite": "^4.4.10",
     "vue": "^2.7.14"

diff --git a/example/vue2/src/app.vue b/example/vue2/src/app.vue
@@ -30,7 +30,7 @@ loadUser().then((user) => {
     ?.initialize(id.value)
     .then(() => console.log("Initialization complete."));
 });
-const present = ref(false);
+const present = ref<boolean>(false);
 
 const cycle = async () => {
   await tiki!.logout().then(async () => {
@@ -41,6 +41,8 @@ const cycle = async () => {
       .then(() => console.log("Initialization complete."));
   });
 };
+
+const update = (val: boolean) => (present.value = val);
 </script>
 
 <template>
@@ -61,10 +63,7 @@ const cycle = async () => {
       <p><b>ID: </b>{{ id }}</p>
       <button class="newUser" @click="cycle">new user</button>
     </div>
-    <tiki-receipt
-      :present="present"
-      @update:present="(val) => (present = val)"
-    />
+    <tiki-receipt :present="present" @update:present="update" />
   </main>
 </template>
 

diff --git a/example/vue2/tsconfig.app.json b/example/vue2/tsconfig.app.json
diff --git a/example/vue2/tsconfig.json b/example/vue2/tsconfig.json
@@ -1,11 +1,23 @@
 {
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.node.json"
-    },
-    {
-      "path": "./tsconfig.app.json"
+  "extends": "@vue/tsconfig/tsconfig.dom.json",
+  "include": [
+    "env.d.ts",
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue"
+  ],
+  "exclude": ["src/**/__tests__/*"],
+  "compilerOptions": {
+    "composite": true,
+    "baseUrl": ".",
+    "target": "ESNext",
+    "module": "ESNext",
+    "outDir": "./dist",
+    "emitDeclarationOnly": true,
+    "declarationDir": "./dist/types",
+    "paths": {
+      "@/*": ["./src/*"]
     }
-  ]
+  }
 }
diff --git a/example/vue2/tsconfig.node.json b/example/vue2/tsconfig.node.json
diff --git a/example/vue3/.eslintrc b/example/vue3/.eslintrc
@@ -15,7 +15,7 @@
     "parser": "@typescript-eslint/parser",
     "sourceType": "module",
     "ecmaVersion": "latest",
-    "project": ["./tsconfig.app.json"],
+    "project": ["./tsconfig.json"],
     "extraFileExtensions": [ ".vue" ]
   },
   "rules": {

diff --git a/example/vue3/ios/App/Podfile b/example/vue3/ios/App/Podfile
@@ -21,10 +21,11 @@ end
 
 target 'App' do
   capacitor_pods
-    
+
   pod 'BlinkReceipt', '~> 1.39'
   pod 'BlinkEReceipt', '~> 2.31'
-  pod 'TikiSdk', '~> 2.1.8'
+  pod 'TikiSdkRelease', '2.1.10', :configurations => 'Release'
+  pod 'TikiSdkDebug', '2.1.10', :configurations => 'Debug'
 end
 
 post_install do |installer|