diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml new file mode 100644 index 0000000..e34606c --- /dev/null +++ b/android/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/java/com/asomn/ionicapp/MainActivity.java b/android/app/src/main/java/com/asomn/ionicapp/MainActivity.java index f3d8bf9..aabd38c 100644 --- a/android/app/src/main/java/com/asomn/ionicapp/MainActivity.java +++ b/android/app/src/main/java/com/asomn/ionicapp/MainActivity.java @@ -2,7 +2,7 @@ import android.os.Bundle; -import com.getcapacitor.camera.preview.CameraPreview; +import com.ahm.capacitor.camera.preview.CameraPreview; import com.getcapacitor.BridgeActivity; import com.getcapacitor.Plugin; diff --git a/android/build.gradle b/android/build.gradle index fc069ba..979d9dd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.google.gms:google-services:4.3.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 1e6473d..fb27aa4 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jan 30 13:14:22 CST 2018 +#Sun May 31 19:17:40 UYT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/package-lock.json b/package-lock.json index 73e9a79..67e6a3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2186,14 +2186,14 @@ } }, "@capacitor/android": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-2.1.0.tgz", - "integrity": "sha512-20t6Ep4cVp6X/7tz3BzvNyqv6WEMfZr4VLA3nQC7WxTLfrYSWWaP8vaKvTFn8u56qCSoCUwYmYlpkib38ptwJg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-2.1.2.tgz", + "integrity": "sha512-V24ZwerrFFWkcLYxhoofhg3Hv4BxH76EFr2zeVJOJkiY9yffey0VMjaE10QPyFrSIshbDtEsYwm2gxUc4wxgjA==" }, "@capacitor/cli": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-2.1.0.tgz", - "integrity": "sha512-j7TPvnQ++xFlZ5hhvdntwK79/Xx+Bns6Y11b5Cco8ydVO4HokQresBRqpU2LaHzABZtWmtrSsFJMF3OqZotguQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-2.1.2.tgz", + "integrity": "sha512-xxkkEKCjQAVvFO5UwnBqAMQ/UcmTQfKAVPBGIqTxT20sqPVxqMq4INGJyB+qu+6pbe7KwZKywBS7/zFMw+Ngtg==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -2320,9 +2320,9 @@ } }, "@capacitor/core": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-2.1.0.tgz", - "integrity": "sha512-KIDj067PGaNSIODqzDp99vPs7CVpx+SRVrfgcQ9MNvpTUFsnDx/taRixbucizj8lLH2mhK12dH/4TjU7eqXQ4A==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-2.1.2.tgz", + "integrity": "sha512-oi+n23h9cJ/yaeMIlrnoeCV5p7pv2XWdT+cXzwh9j72LV+Y/oSGcNgFWGEAR/B1UVlv6LnLLQSs9CUXhNlh+Nw==", "requires": { "tslib": "^1.9.0" } @@ -4005,6 +4005,16 @@ "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "blob": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", @@ -6489,6 +6499,13 @@ } } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "fileset": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", @@ -9108,6 +9125,13 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "nan": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -13647,7 +13671,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "is-binary-path": { "version": "1.0.1", @@ -14006,7 +14034,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "is-absolute-url": { "version": "3.0.3", diff --git a/package.json b/package.json index e8edb2e..80d64f2 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "@angular/platform-browser-dynamic": "~9.1.9", "@angular/router": "~9.1.9", "@babel/compat-data": "^7.9.6", - "@capacitor/android": "^2.1.0", - "@capacitor/core": "^2.1.0", + "@capacitor/android": "^2.1.2", + "@capacitor/core": "^2.1.2", "@ionic-native/background-mode": "^5.26.0", "@ionic-native/core": "^5.26.0", "@ionic-native/splash-screen": "^5.26.0", @@ -42,7 +42,7 @@ "@angular/compiler": "~9.1.9", "@angular/compiler-cli": "~9.1.9", "@angular/language-service": "~9.1.9", - "@capacitor/cli": "^2.1.0", + "@capacitor/cli": "^2.1.2", "@ionic/angular-toolkit": "^2.1.1", "@ionic/lab": "3.1.2", "@types/jasmine": "~3.3.8",