Skip to content

Commit

Permalink
Merge pull request #1957 from oasisprotocol/mz/cap
Browse files Browse the repository at this point in the history
Upgrade Capacitor to v6
  • Loading branch information
buberdds authored May 28, 2024
2 parents 6127389 + 1a509c7 commit d942d77
Show file tree
Hide file tree
Showing 7 changed files with 132 additions and 107 deletions.
1 change: 1 addition & 0 deletions .changelog/1957.internal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade Capacitor to v6
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
namespace "com.oasisprotocol.wallet"
compileSdkVersion rootProject.ext.compileSdkVersion
compileSdk rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "com.oasisprotocol.wallet"
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.google.gms:google-services:4.4.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 7 additions & 7 deletions android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ext {
minSdkVersion = 22
compileSdkVersion = 33
targetSdkVersion = 33
androidxActivityVersion = '1.7.0'
compileSdkVersion = 34
targetSdkVersion = 34
androidxActivityVersion = '1.8.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.10.0'
androidxFragmentVersion = '1.5.6'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
androidxCoreVersion = '1.12.0'
androidxFragmentVersion = '1.6.2'
coreSplashScreenVersion = '1.0.1'
androidxWebkitVersion = '1.9.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@
"report-dir": "cypress-coverage"
},
"dependencies": {
"@capacitor-community/bluetooth-le": "3.0.0",
"@capacitor/android": "5.0.4",
"@capacitor/app": "5.0.5",
"@capacitor/core": "5.0.4",
"@capacitor/ios": "5.0.4",
"@capacitor-community/bluetooth-le": "6.0.0",
"@capacitor/android": "6.0.0",
"@capacitor/app": "6.0.0",
"@capacitor/core": "6.0.0",
"@capacitor/ios": "6.0.0",
"@ethereumjs/util": "9.0.3",
"@ledgerhq/hw-transport-webusb": "6.28.5",
"@metamask/browser-passworder": "=3.0.0",
"@metamask/jazzicon": "2.0.0",
"@oasisprotocol/client": "0.1.1-alpha.2",
"@oasisprotocol/client-rt": "0.2.1-alpha.2",
"@oasisprotocol/ionic-ledger-hw-transport-ble": "1.0.1-beta",
"@oasisprotocol/ionic-ledger-hw-transport-ble": "6.0.0",
"@oasisprotocol/ledger": "1.0.0",
"@reduxjs/toolkit": "1.9.7",
"base64-arraybuffer": "1.0.2",
Expand Down Expand Up @@ -102,7 +102,7 @@
"webextension-polyfill": "0.10.0"
},
"devDependencies": {
"@capacitor/cli": "5.0.4",
"@capacitor/cli": "6.0.0",
"@cypress/code-coverage": "3.12.15",
"@parcel/config-webextension": "2.10.3",
"@parcel/packager-raw-url": "2.10.3",
Expand Down
Loading

0 comments on commit d942d77

Please sign in to comment.