Skip to content

Commit 53a43b9

Browse files
jensuenkJens UenkWillem Slaghekke
authored
Feature/upgrade to capacitor 6 (#45)
* Upgrade library to support Capacitor 6 * Upgrade peer dep and update android * Version increase --------- Co-authored-by: Jens Uenk <[email protected]> Co-authored-by: Willem Slaghekke <[email protected]>
1 parent 9d4f497 commit 53a43b9

File tree

5 files changed

+1396
-361
lines changed

5 files changed

+1396
-361
lines changed

android/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
4-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
5-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
6-
recognizebvMSALVersion = project.hasProperty("recognizebvMSALVersion") ? rootProject.ext.recognizebvMSALVersion : '4.9.0'
3+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
4+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
5+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
6+
recognizebvMSALVersion = project.hasProperty("recognizebvMSALVersion") ? rootProject.ext.recognizebvMSALVersion : '5.4.0'
77
}
88

99
buildscript {
@@ -12,7 +12,7 @@ buildscript {
1212
mavenCentral()
1313
}
1414
dependencies {
15-
classpath 'com.android.tools.build:gradle:8.0.0'
15+
classpath 'com.android.tools.build:gradle:8.2.1'
1616
}
1717
}
1818

@@ -66,15 +66,15 @@ dependencies {
6666
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
6767
implementation "com.microsoft.identity.client:msal:$recognizebvMSALVersion"
6868

69-
testImplementation "org.json:json:20230227"
69+
testImplementation "org.json:json:20240303"
7070
testImplementation "org.mockito:mockito-inline:5.2.0"
71-
testImplementation "org.mockito:mockito-junit-jupiter:5.3.1"
72-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
73-
testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
71+
testImplementation "org.mockito:mockito-junit-jupiter:5.12.0"
72+
testImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0-M2"
73+
testImplementation "org.junit.jupiter:junit-jupiter-params:5.11.0-M2"
7474
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
7575
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
76-
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.0"
77-
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.8.0"
76+
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0-M2"
77+
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.11.0-M2"
7878
}
7979

8080
tasks.withType(Test) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PODS:
2-
- Capacitor (5.2.2):
2+
- Capacitor (6.1.0):
33
- CapacitorCordova
4-
- CapacitorCordova (5.2.2)
4+
- CapacitorCordova (6.1.0)
55
- MSAL (1.1.19):
66
- MSAL/app-lib (= 1.1.19)
77
- MSAL/app-lib (1.1.19)
@@ -22,10 +22,10 @@ EXTERNAL SOURCES:
2222
:path: "../node_modules/@capacitor/ios"
2323

2424
SPEC CHECKSUMS:
25-
Capacitor: 070b18988e0f566728ae9a5eb3a7a974595f1626
26-
CapacitorCordova: 3773395d5331add072300ff6041ca2cf7b93cb0b
25+
Capacitor: 187bd7847b6f71467015a20200a1a071be3e5f14
26+
CapacitorCordova: be703980ca797f847c3356f78fa175d21c8330c2
2727
MSAL: 0a4993a743aa45147c78c698e0412d00cb005c1a
2828

2929
PODFILE CHECKSUM: f6274e5f60bf7be2dab2cca23d5c22f5d9f33c9e
3030

31-
COCOAPODS: 1.12.1
31+
COCOAPODS: 1.15.2

0 commit comments

Comments
 (0)