From 16aa6fa8d4e1cf56441027647625b70bf645e233 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 15 Jan 2021 11:07:20 +0100 Subject: [PATCH] add jetifier --- android/app/build.gradle | 1 + package-lock.json | 5 +++++ package.json | 1 + .../publications/new-publication/new-publication.page.ts | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 43db40b10..20c80874b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -28,6 +28,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" implementation project(':capacitor-android') + implementation 'com.android.support:support-v4:28.0.0' testImplementation "junit:junit:$junitVersion" androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion" diff --git a/package-lock.json b/package-lock.json index d2ba4c68a..9a6c1e6e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8739,6 +8739,11 @@ } } }, + "jetifier": { + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/jetifier/-/jetifier-1.6.6.tgz", + "integrity": "sha512-JNAkmPeB/GS2tCRqUzRPsTOHpGDah7xP18vGJfIjZC+W2sxEHbxgJxetIjIqhjQ3yYbYNEELkM/spKLtwoOSUQ==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/package.json b/package.json index 539454fce..d26fbd427 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "ionic-selectable": "^4.5.0", "ionic2-alpha-scroll": "^2.0.1", "ionic2-calendar": "^0.6.6", + "jetifier": "^1.6.6", "moment": "^2.27.0", "ngx-socket-io": "^3.2.0", "rxjs": "~6.5.1", diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index ee3389064..48a448a72 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -10,9 +10,10 @@ import { Image } from 'src/app/models/image'; import { ThrowStmt } from '@angular/compiler'; import { PhotoService } from 'src/app/services/photo.service'; import { AlertService } from 'src/app/services/alert.service'; - +//Capacitor /* const { Camera } = Plugins; */ +//Cordova import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; import { PublicationFolder } from 'src/app/models/publicationfolder'; import { ViewPublicationsPage } from '../view-publications/view-publications.page';