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]>
recognizegroup · Aug 7, 2024 · 53a43b9 · 53a43b9
1 parent 9d4f497
commit 53a43b9
Show file tree

Hide file tree

Showing 5 changed files with 1,396 additions and 361 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,9 +1,9 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
-    recognizebvMSALVersion = project.hasProperty("recognizebvMSALVersion") ? rootProject.ext.recognizebvMSALVersion : '4.9.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
+    recognizebvMSALVersion = project.hasProperty("recognizebvMSALVersion") ? rootProject.ext.recognizebvMSALVersion : '5.4.0'
 }
 
 buildscript {
@@ -12,7 +12,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
     }
 }
 
@@ -66,15 +66,15 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "com.microsoft.identity.client:msal:$recognizebvMSALVersion"
 
-    testImplementation "org.json:json:20230227"
+    testImplementation "org.json:json:20240303"
     testImplementation "org.mockito:mockito-inline:5.2.0"
-    testImplementation "org.mockito:mockito-junit-jupiter:5.3.1"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.9.3"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.9.3"
+    testImplementation "org.mockito:mockito-junit-jupiter:5.12.0"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.11.0-M2"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:5.11.0-M2"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.0"
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.8.0"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.11.0-M2"
+    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:5.11.0-M2"
 }
 
 tasks.withType(Test) {

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -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-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
-  - Capacitor (5.2.2):
+  - Capacitor (6.1.0):
     - CapacitorCordova
-  - CapacitorCordova (5.2.2)
+  - CapacitorCordova (6.1.0)
   - MSAL (1.1.19):
     - MSAL/app-lib (= 1.1.19)
   - MSAL/app-lib (1.1.19)
@@ -22,10 +22,10 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@capacitor/ios"
 
 SPEC CHECKSUMS:
-  Capacitor: 070b18988e0f566728ae9a5eb3a7a974595f1626
-  CapacitorCordova: 3773395d5331add072300ff6041ca2cf7b93cb0b
+  Capacitor: 187bd7847b6f71467015a20200a1a071be3e5f14
+  CapacitorCordova: be703980ca797f847c3356f78fa175d21c8330c2
   MSAL: 0a4993a743aa45147c78c698e0412d00cb005c1a
 
 PODFILE CHECKSUM: f6274e5f60bf7be2dab2cca23d5c22f5d9f33c9e
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2