From 487bf19932288596cfef02949bc2dbb19ff6bc1c Mon Sep 17 00:00:00 2001 From: Tony Giorgio Date: Sat, 4 Nov 2023 12:26:24 -0500 Subject: [PATCH 1/2] Downgrade capacitor browser --- android/capacitor.settings.gradle | 18 +++++++++--------- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 6a16b75e..13433cf2 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -1,27 +1,27 @@ // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN include ':capacitor-android' -project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@5.2.2_@capacitor+core@5.2.2/node_modules/@capacitor/android/capacitor') +project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@5.5.1_@capacitor+core@5.5.1/node_modules/@capacitor/android/capacitor') include ':capacitor-app' -project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.2.2/node_modules/@capacitor/app/android') +project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/app/android') include ':capacitor-browser' -project(':capacitor-browser').projectDir = new File('../node_modules/.pnpm/@capacitor+browser@5.0.6_@capacitor+core@5.2.2/node_modules/@capacitor/browser/android') +project(':capacitor-browser').projectDir = new File('../node_modules/.pnpm/@capacitor+browser@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/browser/android') include ':capacitor-clipboard' -project(':capacitor-clipboard').projectDir = new File('../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.2.2/node_modules/@capacitor/clipboard/android') +project(':capacitor-clipboard').projectDir = new File('../node_modules/.pnpm/@capacitor+clipboard@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/clipboard/android') include ':capacitor-filesystem' -project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.2.2/node_modules/@capacitor/filesystem/android') +project(':capacitor-filesystem').projectDir = new File('../node_modules/.pnpm/@capacitor+filesystem@5.1.4_@capacitor+core@5.5.1/node_modules/@capacitor/filesystem/android') include ':capacitor-haptics' -project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.2.2/node_modules/@capacitor/haptics/android') +project(':capacitor-haptics').projectDir = new File('../node_modules/.pnpm/@capacitor+haptics@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/haptics/android') include ':capacitor-share' -project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.2.2/node_modules/@capacitor/share/android') +project(':capacitor-share').projectDir = new File('../node_modules/.pnpm/@capacitor+share@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/share/android') include ':capacitor-toast' -project(':capacitor-toast').projectDir = new File('../node_modules/.pnpm/@capacitor+toast@5.0.6_@capacitor+core@5.2.2/node_modules/@capacitor/toast/android') +project(':capacitor-toast').projectDir = new File('../node_modules/.pnpm/@capacitor+toast@5.0.6_@capacitor+core@5.5.1/node_modules/@capacitor/toast/android') include ':mutinywallet-barcode-scanner' -project(':mutinywallet-barcode-scanner').projectDir = new File('../node_modules/.pnpm/@mutinywallet+barcode-scanner@5.0.0-beta.3_@capacitor+core@5.2.2/node_modules/@mutinywallet/barcode-scanner/android') +project(':mutinywallet-barcode-scanner').projectDir = new File('../node_modules/.pnpm/@mutinywallet+barcode-scanner@5.0.0-beta.3_@capacitor+core@5.5.1/node_modules/@mutinywallet/barcode-scanner/android') diff --git a/package.json b/package.json index 3321e0fb..b153c7ba 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "dependencies": { "@capacitor/android": "^5.5.1", "@capacitor/app": "^5.0.6", - "@capacitor/browser": "^5.1.0", + "@capacitor/browser": "5.0.6", "@capacitor/clipboard": "^5.0.6", "@capacitor/core": "^5.5.1", "@capacitor/filesystem": "^5.1.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6f818a0..a7c660e3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: ^5.0.6 version: 5.0.6(@capacitor/core@5.5.1) '@capacitor/browser': - specifier: ^5.1.0 - version: 5.1.0(@capacitor/core@5.5.1) + specifier: 5.0.6 + version: 5.0.6(@capacitor/core@5.5.1) '@capacitor/clipboard': specifier: ^5.0.6 version: 5.0.6(@capacitor/core@5.5.1) @@ -2568,8 +2568,8 @@ packages: - typescript dev: true - /@capacitor/browser@5.1.0(@capacitor/core@5.5.1): - resolution: {integrity: sha512-7togqchk2Tvq4SmLaWhcrd4x48ES/GEZsceM+29aun7WhxQEVcDU0cJsVdSU2LNFwNhWgPV2GW90etVd1B3OdQ==} + /@capacitor/browser@5.0.6(@capacitor/core@5.5.1): + resolution: {integrity: sha512-wEI7Na6PVzSP/00ud7pjbBwXwVG7HywCdy2fJT/hzF6yuHn4tDirbOvbr1JKd9LZqKs2Xn+TapV38JhBRhX6YA==} peerDependencies: '@capacitor/core': ^5.0.0 dependencies: From 95dd013d1ee7dcb30b6eceb14554fd50cd7f6916 Mon Sep 17 00:00:00 2001 From: Tony Giorgio Date: Sat, 4 Nov 2023 12:27:22 -0500 Subject: [PATCH 2/2] Bump android to 0.4.28-1 --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 29985563..8f84712b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.mutinywallet.mutinywallet" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 28 - versionName "0.4.28" + versionCode 29 + versionName "0.4.28-1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.