scandit-capacitor-datacapture-parser 6.18.2 → 6.19.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ScanditCapacitorDatacaptureParser.podspec +1 -1
- package/android/build.gradle +11 -6
- package/android/src/main/AndroidManifest.xml +1 -1
- package/android/src/main/java/com/scandit/capacitor/datacapture/parser/ScanditParserNative.kt +14 -11
- package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureContextProxy.js +3 -11
- package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureContextProxy.js.map +1 -1
- package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureViewProxy.js +8 -7
- package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureViewProxy.js.map +1 -1
- package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/Defaults.d.ts +3 -3
- package/dist/esm/scandit-capacitor-datacapture-core/src/ts/DataCaptureContext.js +0 -17
- package/dist/esm/scandit-capacitor-datacapture-core/src/ts/DataCaptureContext.js.map +1 -1
- package/ios/Plugin/ScanditParserPluginPlugin.swift +4 -5
- package/package.json +8 -8
package/android/build.gradle
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
ext {
|
|
3
|
-
androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.
|
|
3
|
+
androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.10.0'
|
|
4
4
|
cordovaAndroidVersion = project.hasProperty('cordovaAndroidVersion') ? rootProject.ext.cordovaAndroidVersion : '10.1.1'
|
|
5
5
|
}
|
|
6
6
|
|
|
@@ -10,8 +10,8 @@ def safeExtGet(prop, fallback) {
|
|
|
10
10
|
|
|
11
11
|
buildscript {
|
|
12
12
|
ext {
|
|
13
|
-
kotlin_version = "1.
|
|
14
|
-
agp_version = "
|
|
13
|
+
kotlin_version = "1.8.20"
|
|
14
|
+
agp_version = "8.0.1"
|
|
15
15
|
}
|
|
16
16
|
repositories {
|
|
17
17
|
google()
|
|
@@ -27,10 +27,11 @@ apply plugin: 'com.android.library'
|
|
|
27
27
|
apply plugin: 'kotlin-android'
|
|
28
28
|
|
|
29
29
|
android {
|
|
30
|
-
|
|
30
|
+
namespace "com.scandit.capacitor.datacapture.parser"
|
|
31
|
+
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
|
|
31
32
|
defaultConfig {
|
|
32
33
|
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
|
|
33
|
-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion :
|
|
34
|
+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
|
|
34
35
|
versionCode 1
|
|
35
36
|
versionName "1.0"
|
|
36
37
|
}
|
|
@@ -43,6 +44,10 @@ android {
|
|
|
43
44
|
lintOptions {
|
|
44
45
|
abortOnError false
|
|
45
46
|
}
|
|
47
|
+
compileOptions {
|
|
48
|
+
sourceCompatibility = JavaVersion.VERSION_17
|
|
49
|
+
targetCompatibility = JavaVersion.VERSION_17
|
|
50
|
+
}
|
|
46
51
|
}
|
|
47
52
|
|
|
48
53
|
repositories {
|
|
@@ -51,7 +56,7 @@ repositories {
|
|
|
51
56
|
}
|
|
52
57
|
|
|
53
58
|
dependencies {
|
|
54
|
-
def sdk_version = "6.
|
|
59
|
+
def sdk_version = "6.19.0-beta.0"
|
|
55
60
|
|
|
56
61
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
|
57
62
|
implementation fileTree(dir: 'library', include: ['*.aar'])
|
package/android/src/main/java/com/scandit/capacitor/datacapture/parser/ScanditParserNative.kt
CHANGED
|
@@ -13,15 +13,14 @@ import com.getcapacitor.PluginCall
|
|
|
13
13
|
import com.getcapacitor.PluginMethod
|
|
14
14
|
import com.getcapacitor.annotation.CapacitorPlugin
|
|
15
15
|
import com.scandit.capacitor.datacapture.core.ScanditCaptureCoreNative
|
|
16
|
-
import com.scandit.capacitor.datacapture.core.communication.ComponentDeserializersProvider
|
|
17
|
-
import com.scandit.capacitor.datacapture.core.deserializers.DeserializationLifecycleObserver
|
|
18
16
|
import com.scandit.capacitor.datacapture.parser.data.SerializableParserInput
|
|
19
17
|
import com.scandit.capacitor.datacapture.parser.errors.CannotParseRawDataError
|
|
20
18
|
import com.scandit.capacitor.datacapture.parser.errors.CannotParseStringError
|
|
21
19
|
import com.scandit.capacitor.datacapture.parser.errors.ParserInstanceNotFoundError
|
|
22
20
|
import com.scandit.capacitor.datacapture.parser.handlers.ParsersHandler
|
|
23
|
-
import com.scandit.datacapture.core.component.serialization.DataCaptureComponentDeserializer
|
|
24
21
|
import com.scandit.datacapture.core.json.JsonValue
|
|
22
|
+
import com.scandit.datacapture.frameworks.core.deserialization.DeserializationLifecycleObserver
|
|
23
|
+
import com.scandit.datacapture.frameworks.core.deserialization.Deserializers
|
|
25
24
|
import com.scandit.datacapture.parser.ParsedData
|
|
26
25
|
import com.scandit.datacapture.parser.Parser
|
|
27
26
|
import com.scandit.datacapture.parser.serialization.ParserDeserializer
|
|
@@ -33,12 +32,12 @@ import org.json.JSONObject
|
|
|
33
32
|
class ScanditParserNative :
|
|
34
33
|
Plugin(),
|
|
35
34
|
ParserDeserializerListener,
|
|
36
|
-
ComponentDeserializersProvider,
|
|
37
35
|
DeserializationLifecycleObserver.Observer {
|
|
38
36
|
|
|
39
|
-
val a = System.currentTimeMillis()
|
|
40
37
|
private val parsersHandler: ParsersHandler = ParsersHandler()
|
|
41
38
|
|
|
39
|
+
private val parserDeserializer = ParserDeserializer()
|
|
40
|
+
|
|
42
41
|
companion object {
|
|
43
42
|
private const val FIELD_RESULT = "result"
|
|
44
43
|
private const val CORE_PLUGIN_NAME = "ScanditCaptureCoreNative"
|
|
@@ -57,6 +56,16 @@ class ScanditParserNative :
|
|
|
57
56
|
}
|
|
58
57
|
}
|
|
59
58
|
|
|
59
|
+
override fun handleOnStart() {
|
|
60
|
+
parserDeserializer.listener = this
|
|
61
|
+
Deserializers.Factory.addComponentDeserializer(parserDeserializer)
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
override fun handleOnPause() {
|
|
65
|
+
parserDeserializer.listener = null
|
|
66
|
+
Deserializers.Factory.removeComponentDeserializer(parserDeserializer)
|
|
67
|
+
}
|
|
68
|
+
|
|
60
69
|
@PluginMethod
|
|
61
70
|
fun getDefaults(call: PluginCall) {
|
|
62
71
|
this.onParserDefaults(call)
|
|
@@ -163,12 +172,6 @@ class ScanditParserNative :
|
|
|
163
172
|
}
|
|
164
173
|
//endregion
|
|
165
174
|
|
|
166
|
-
//region ComponentDeserializersProvider
|
|
167
|
-
override fun provideComponentDeserializers(): List<DataCaptureComponentDeserializer> = listOf(
|
|
168
|
-
ParserDeserializer().also { it.listener = this }
|
|
169
|
-
)
|
|
170
|
-
//endregion
|
|
171
|
-
|
|
172
175
|
override fun onParsersRemoved() {
|
|
173
176
|
parsersHandler.clearParsers()
|
|
174
177
|
}
|
package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureContextProxy.js
CHANGED
|
@@ -2,8 +2,8 @@ import { ContextStatus } from '../DataCaptureContext+Related';
|
|
|
2
2
|
import { Capacitor, CapacitorFunction } from './Capacitor';
|
|
3
3
|
var DataCaptureContextListenerEvent;
|
|
4
4
|
(function (DataCaptureContextListenerEvent) {
|
|
5
|
-
DataCaptureContextListenerEvent["DidChangeContextStatus"] = "
|
|
6
|
-
DataCaptureContextListenerEvent["DidStartObservingContext"] = "
|
|
5
|
+
DataCaptureContextListenerEvent["DidChangeContextStatus"] = "DataCaptureContextListener.onStatusChanged";
|
|
6
|
+
DataCaptureContextListenerEvent["DidStartObservingContext"] = "DataCaptureContextListener.onObservationStarted";
|
|
7
7
|
})(DataCaptureContextListenerEvent || (DataCaptureContextListenerEvent = {}));
|
|
8
8
|
// TODO: adjust when readding framedata to the api https://jira.scandit.com/browse/SDC-1159
|
|
9
9
|
// enum DataCaptureContextFrameListenerEvent {
|
|
@@ -27,8 +27,6 @@ export class DataCaptureContextProxy {
|
|
|
27
27
|
}
|
|
28
28
|
initialize() {
|
|
29
29
|
this.subscribeListener();
|
|
30
|
-
// TODO: adjust when readding framedata to the api https://jira.scandit.com/browse/SDC-1159
|
|
31
|
-
// this.subscribeFrameListener();
|
|
32
30
|
this.initializeContextFromJSON();
|
|
33
31
|
}
|
|
34
32
|
initializeContextFromJSON() {
|
|
@@ -43,11 +41,6 @@ export class DataCaptureContextProxy {
|
|
|
43
41
|
window.Capacitor.Plugins[Capacitor.pluginName]
|
|
44
42
|
.addListener(DataCaptureContextListenerEvent.DidStartObservingContext, this.notifyListeners.bind(this));
|
|
45
43
|
}
|
|
46
|
-
// TODO: adjust when readding framedata to the api https://jira.scandit.com/browse/SDC-1159
|
|
47
|
-
// private subscribeFrameListener() {
|
|
48
|
-
// window.Capacitor.Plugins[Capacitor.pluginName][CapacitorFunction.SubscribeContextFrameListener]()
|
|
49
|
-
// .then(this.notifyFrameListeners.bind(this), null)
|
|
50
|
-
// }
|
|
51
44
|
notifyListeners(event) {
|
|
52
45
|
if (!event) {
|
|
53
46
|
// The event could be undefined/null in case the plugin result did not pass a "message",
|
|
@@ -55,12 +48,11 @@ export class DataCaptureContextProxy {
|
|
|
55
48
|
// listener subscriptions.
|
|
56
49
|
return;
|
|
57
50
|
}
|
|
58
|
-
event = Object.assign(Object.assign(Object.assign({}, event), event.argument), { argument: undefined });
|
|
59
51
|
this.context.listeners.forEach((listener) => {
|
|
60
52
|
switch (event.name) {
|
|
61
53
|
case DataCaptureContextListenerEvent.DidChangeContextStatus:
|
|
62
54
|
if (listener.didChangeStatus) {
|
|
63
|
-
const contextStatus = ContextStatus.fromJSON(event.
|
|
55
|
+
const contextStatus = ContextStatus.fromJSON(event.status);
|
|
64
56
|
listener.didChangeStatus(this.context, contextStatus);
|
|
65
57
|
}
|
|
66
58
|
break;
|
package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureContextProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataCaptureContextProxy.js","sourceRoot":"","sources":["../../../../../../../scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureContextProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoD,MAAM,+BAA+B,CAAC;AAChH,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAmB,MAAM,aAAa,CAAC;AAM5E,IAAK,+BAGJ;AAHD,WAAK,+BAA+B;IAChC,
|
|
1
|
+
{"version":3,"file":"DataCaptureContextProxy.js","sourceRoot":"","sources":["../../../../../../../scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureContextProxy.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureViewProxy.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { Point, Quadrilateral, Size, } from '../Common';
|
|
2
2
|
import { Capacitor, CapacitorFunction } from './Capacitor';
|
|
3
|
-
import { doReturnWithFinish } from './CommonCapacitor';
|
|
4
3
|
var DataCaptureViewListenerEvent;
|
|
5
4
|
(function (DataCaptureViewListenerEvent) {
|
|
6
|
-
DataCaptureViewListenerEvent["DidChangeSizeOrientation"] = "
|
|
5
|
+
DataCaptureViewListenerEvent["DidChangeSizeOrientation"] = "DataCaptureViewListener.onSizeChanged";
|
|
7
6
|
})(DataCaptureViewListenerEvent || (DataCaptureViewListenerEvent = {}));
|
|
8
7
|
export class DataCaptureViewProxy {
|
|
9
8
|
static forDataCaptureView(view) {
|
|
@@ -26,13 +25,16 @@ export class DataCaptureViewProxy {
|
|
|
26
25
|
viewPointForFramePoint(point) {
|
|
27
26
|
return new Promise((resolve, reject) => window.Capacitor.Plugins[Capacitor.pluginName][CapacitorFunction.ViewPointForFramePoint]({
|
|
28
27
|
point: point.toJSON(),
|
|
29
|
-
}).then((
|
|
28
|
+
}).then((result) => resolve(Point.fromJSON(JSON.parse(result.data))), reject.bind(this)));
|
|
30
29
|
}
|
|
31
30
|
viewQuadrilateralForFrameQuadrilateral(quadrilateral) {
|
|
32
31
|
return new Promise((resolve, reject) => window.Capacitor.Plugins[Capacitor.pluginName][CapacitorFunction.ViewQuadrilateralForFrameQuadrilateral]({
|
|
33
32
|
point: quadrilateral.toJSON(),
|
|
34
|
-
}).then((
|
|
35
|
-
|
|
33
|
+
}).then((result) => {
|
|
34
|
+
const quadrilateral = Quadrilateral
|
|
35
|
+
.fromJSON(JSON.parse(result.data));
|
|
36
|
+
resolve(quadrilateral);
|
|
37
|
+
}, reject.bind(this)));
|
|
36
38
|
}
|
|
37
39
|
subscribeListener() {
|
|
38
40
|
window.Capacitor.Plugins[Capacitor.pluginName][CapacitorFunction.SubscribeViewListener]();
|
|
@@ -44,7 +46,7 @@ export class DataCaptureViewProxy {
|
|
|
44
46
|
// The event could be undefined/null in case the plugin result did not pass a "message",
|
|
45
47
|
// which could happen e.g. in case of "ok" results, which could signal e.g. successful
|
|
46
48
|
// listener subscriptions.
|
|
47
|
-
return
|
|
49
|
+
return;
|
|
48
50
|
}
|
|
49
51
|
event = Object.assign(Object.assign(Object.assign({}, event), event.argument), { argument: undefined });
|
|
50
52
|
this.view.listeners.forEach((listener) => {
|
|
@@ -54,7 +56,6 @@ export class DataCaptureViewProxy {
|
|
|
54
56
|
const size = Size.fromJSON(event.size);
|
|
55
57
|
const orientation = event.orientation;
|
|
56
58
|
listener.didChangeSize(this.view, size, orientation);
|
|
57
|
-
return doReturnWithFinish(event.name, null);
|
|
58
59
|
}
|
|
59
60
|
break;
|
|
60
61
|
}
|
package/dist/esm/scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureViewProxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataCaptureViewProxy.js","sourceRoot":"","sources":["../../../../../../../scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureViewProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,EAIL,aAAa,EAEb,IAAI,GACP,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAmB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"DataCaptureViewProxy.js","sourceRoot":"","sources":["../../../../../../../scandit-capacitor-datacapture-core/src/ts/Capacitor/DataCaptureViewProxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,17 +75,17 @@ export interface PrivateCameraSettingsDefaults {
|
|
|
75
75
|
fromJSON(json: CameraSettingsDefaultsJSON): CameraSettings;
|
|
76
76
|
}
|
|
77
77
|
export interface IdCaptureOverlayDefaultsJSON {
|
|
78
|
-
|
|
78
|
+
DefaultCapturedBrush: {
|
|
79
79
|
fillColor: string;
|
|
80
80
|
strokeColor: string;
|
|
81
81
|
strokeWidth: number;
|
|
82
82
|
};
|
|
83
|
-
|
|
83
|
+
DefaultLocalizedBrush: {
|
|
84
84
|
fillColor: string;
|
|
85
85
|
strokeColor: string;
|
|
86
86
|
strokeWidth: number;
|
|
87
87
|
};
|
|
88
|
-
|
|
88
|
+
DefaultRejectedBrush: {
|
|
89
89
|
fillColor: string;
|
|
90
90
|
strokeColor: string;
|
|
91
91
|
strokeWidth: number;
|
|
@@ -19,9 +19,6 @@ export class DataCaptureContextSettings extends DefaultSerializeable {
|
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
export class DataCaptureContext extends DefaultSerializeable {
|
|
22
|
-
// TODO: adjust when readding framedata to the api https://jira.scandit.com/browse/SDC-1159
|
|
23
|
-
// @ignoreFromSerialization
|
|
24
|
-
// private frameListeners: DataCaptureContextFrameListener[] = [];
|
|
25
22
|
get frameSource() {
|
|
26
23
|
return this._frameSource;
|
|
27
24
|
}
|
|
@@ -76,20 +73,6 @@ export class DataCaptureContext extends DefaultSerializeable {
|
|
|
76
73
|
}
|
|
77
74
|
this.listeners.splice(this.listeners.indexOf(listener), 1);
|
|
78
75
|
}
|
|
79
|
-
// TODO: adjust when readding framedata to the api https://jira.scandit.com/browse/SDC-1159
|
|
80
|
-
// public addFrameListener(frameListener: DataCaptureContextFrameListener) {
|
|
81
|
-
// if (this.frameListeners.includes(frameListener)) {
|
|
82
|
-
// return;
|
|
83
|
-
// }
|
|
84
|
-
// this.frameListeners.push(frameListener);
|
|
85
|
-
// }
|
|
86
|
-
// TODO: adjust when readding framedata to the api https://jira.scandit.com/browse/SDC-1159
|
|
87
|
-
// public removeFrameListener(frameListener: DataCaptureContextFrameListener) {
|
|
88
|
-
// if (!this.frameListeners.includes(frameListener)) {
|
|
89
|
-
// return;
|
|
90
|
-
// }
|
|
91
|
-
// this.frameListeners.splice(this.frameListeners.indexOf(frameListener), 1);
|
|
92
|
-
// }
|
|
93
76
|
addMode(mode) {
|
|
94
77
|
if (!this.modes.includes(mode)) {
|
|
95
78
|
this.modes.push(mode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataCaptureContext.js","sourceRoot":"","sources":["../../../../../../scandit-capacitor-datacapture-core/src/ts/DataCaptureContext.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAG9E,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,oBAAoB,EAAiB,MAAM,iBAAiB,CAAC;AAgCrH,MAAM,OAAO,0BAA2B,SAAQ,oBAAoB;IAClE;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAEM,WAAW,CAAC,IAAY,EAAE,KAAU;QACxC,IAAY,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IAC9B,CAAC;IAEM,WAAW,CAAC,IAAY;QAC7B,OAAQ,IAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,oBAAoB;
|
|
1
|
+
{"version":3,"file":"DataCaptureContext.js","sourceRoot":"","sources":["../../../../../../scandit-capacitor-datacapture-core/src/ts/DataCaptureContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,14 +22,13 @@ extension Array where Element == Parser {
|
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
@objc(ScanditParserNative)
|
|
25
|
-
public class ScanditParserNative: CAPPlugin
|
|
25
|
+
public class ScanditParserNative: CAPPlugin {
|
|
26
26
|
private let implementation = ScanditParserPlugin()
|
|
27
|
-
lazy public var modeDeserializers: [DataCaptureModeDeserializer] = []
|
|
28
27
|
|
|
29
|
-
lazy
|
|
28
|
+
lazy var parserDeserializer: ParserDeserializer = {
|
|
30
29
|
let parserDeserializer = ParserDeserializer()
|
|
31
30
|
parserDeserializer.delegate = self
|
|
32
|
-
return
|
|
31
|
+
return parserDeserializer
|
|
33
32
|
}()
|
|
34
33
|
|
|
35
34
|
public var components: [DataCaptureComponent] {
|
|
@@ -39,7 +38,7 @@ public class ScanditParserNative: CAPPlugin, DataCapturePlugin {
|
|
|
39
38
|
lazy var parsers = [Parser]()
|
|
40
39
|
|
|
41
40
|
override public func load() {
|
|
42
|
-
|
|
41
|
+
ScanditCapacitorCore.registerComponentDeserializer(parserDeserializer)
|
|
43
42
|
}
|
|
44
43
|
|
|
45
44
|
@objc(getDefaults:)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "scandit-capacitor-datacapture-parser",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.19.0-beta.0",
|
|
4
4
|
"description": "Scandit Data Capture SDK for Capacitor",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"private": false,
|
|
@@ -34,15 +34,15 @@
|
|
|
34
34
|
"watch": "tsc --watch"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"scandit-capacitor-datacapture-core": "6.
|
|
37
|
+
"scandit-capacitor-datacapture-core": "6.19.0-beta.0"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@capacitor/android": "
|
|
41
|
-
"@capacitor/core": "
|
|
42
|
-
"@capacitor/ios": "
|
|
43
|
-
"@
|
|
44
|
-
"@ionic/
|
|
45
|
-
"@
|
|
40
|
+
"@capacitor/android": "^5.0.0",
|
|
41
|
+
"@capacitor/core": "^5.0.0",
|
|
42
|
+
"@capacitor/ios": "^5.0.0",
|
|
43
|
+
"@capacitor/docgen": "^0.2.1",
|
|
44
|
+
"@ionic/prettier-config": "^1.0.1",
|
|
45
|
+
"@ionic/swiftlint-config": "^1.1.2",
|
|
46
46
|
"@types/node": "18.15.3",
|
|
47
47
|
"prettier": "^2.0.5",
|
|
48
48
|
"prettier-plugin-java": "^2.0.0",
|