Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #340 from tiki/release/bump-tikisdk-ios
Browse files Browse the repository at this point in the history
fix: bump tikisdk 3.0.0
  • Loading branch information
timoguin authored Oct 18, 2023
2 parents 1641b18 + a2df4d5 commit d90ff9b
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 51 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ target <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
```

Expand Down
36 changes: 18 additions & 18 deletions example/vue2/ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
9A2CD42EB4FC1D831D8E2DDE /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC25466F46DD9826B69AD049 /* Pods_App.framework */; };
E4E5024D2579EAC521E8D0D8 /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6BA32F966DEB60C35333DA7 /* Pods_App.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -27,17 +27,17 @@
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>"; };
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; };
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 = "<group>"; };
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 = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
504EC3011FED79650016851F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9A2CD42EB4FC1D831D8E2DDE /* Pods_App.framework in Frameworks */,
E4E5024D2579EAC521E8D0D8 /* Pods_App.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -49,8 +49,8 @@
children = (
504EC3061FED79650016851F /* App */,
504EC3051FED79650016851F /* Products */,
CC3C62932352AE3DBB1E3ECC /* Pods */,
D2496E952483A21AEB190455 /* Frameworks */,
C0A8645BD60FBB5580CCD625 /* Pods */,
F02A3D7C5F31281E05AADBE3 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -77,20 +77,20 @@
path = App;
sourceTree = "<group>";
};
CC3C62932352AE3DBB1E3ECC /* Pods */ = {
C0A8645BD60FBB5580CCD625 /* Pods */ = {
isa = PBXGroup;
children = (
764261C7588CB2DD520979D5 /* Pods-App.debug.xcconfig */,
95B6615D0B6A8C6520433239 /* Pods-App.release.xcconfig */,
C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */,
568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
D2496E952483A21AEB190455 /* Frameworks */ = {
F02A3D7C5F31281E05AADBE3 /* Frameworks */ = {
isa = PBXGroup;
children = (
DC25466F46DD9826B69AD049 /* Pods_App.framework */,
B6BA32F966DEB60C35333DA7 /* Pods_App.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -102,11 +102,11 @@
isa = PBXNativeTarget;
buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
buildPhases = (
D3AC0867514B9957338AD452 /* [CP] Check Pods Manifest.lock */,
9A7B00240E3692B9D7D8B7B1 /* [CP] Check Pods Manifest.lock */,
504EC3001FED79650016851F /* Sources */,
504EC3011FED79650016851F /* Frameworks */,
504EC3021FED79650016851F /* Resources */,
02401EC8218129B5121937DA /* [CP] Embed Pods Frameworks */,
520A4ADEA6D9F05D8FE9CE7B /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -168,7 +168,7 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
02401EC8218129B5121937DA /* [CP] Embed Pods Frameworks */ = {
520A4ADEA6D9F05D8FE9CE7B /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand All @@ -183,7 +183,7 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D3AC0867514B9957338AD452 /* [CP] Check Pods Manifest.lock */ = {
9A7B00240E3692B9D7D8B7B1 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
Expand Down Expand Up @@ -347,7 +347,7 @@
};
504EC3171FED79650016851F /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 764261C7588CB2DD520979D5 /* Pods-App.debug.xcconfig */;
baseConfigurationReference = C4FBEFD13D5AA4DB3173433D /* Pods-App.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand All @@ -368,7 +368,7 @@
};
504EC3181FED79650016851F /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 95B6615D0B6A8C6520433239 /* Pods-App.release.xcconfig */;
baseConfigurationReference = 568281453A76810A1FC6AD9A /* Pods-App.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
Expand Down
4 changes: 2 additions & 2 deletions example/vue2/ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
22 changes: 11 additions & 11 deletions example/vue2/ios/App/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand Down Expand Up @@ -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
14 changes: 7 additions & 7 deletions example/vue2/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/vue2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions example/vue3/ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
2 changes: 1 addition & 1 deletion example/vue3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 4 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +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 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
Expand All @@ -41,7 +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 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:
Expand Down
6 changes: 3 additions & 3 deletions vue2/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions vue3/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
}
}

0 comments on commit d90ff9b

Please sign in to comment.