Merge pull request #401 from okta/update_vulns

Fix some vulns in E2E android app
okta · Dec 20, 2023 · 5ffcd46 · 5ffcd46
2 parents d2fe27a + 71062d8
commit 5ffcd46
Show file tree

Hide file tree

Showing 4 changed files with 185 additions and 151 deletions.
diff --git a/e2e/android/build.gradle b/e2e/android/build.gradle
@@ -1,12 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    configurations.configureEach { configuration ->
-        configuration.resolutionStrategy {
-            force 'commons-fileupload:commons-fileupload:1.5'
-            force 'com.google.guava:guava:32.1.3-android'
-        }
-    }
+    apply from: 'forceVersions.gradle'
+    forceVersions(configurations)
 
     ext {
         buildToolsVersion = findProperty('android.buildToolsVersion') ?: '34.0.0'
@@ -30,13 +26,12 @@ buildscript {
 
 apply plugin: "com.facebook.react.rootproject"
 
+subprojects {
+    task allDeps(type: DependencyReportTask) {}
+}
+
 allprojects {
-    configurations.configureEach { configuration ->
-        configuration.resolutionStrategy {
-            force 'commons-fileupload:commons-fileupload:1.5'
-            force 'com.google.guava:guava:32.1.3-android'
-        }
-    }
+    forceVersions(configurations)
 
     repositories {
         maven {

diff --git a/e2e/android/forceVersions.gradle b/e2e/android/forceVersions.gradle
@@ -0,0 +1,13 @@
+def forceVersions(ConfigurationContainer configurations) {
+    configurations.configureEach { configuration ->
+        configuration.resolutionStrategy {
+            force 'commons-fileupload:commons-fileupload:1.5'
+            force 'com.google.guava:guava:32.1.3-android'
+            force 'org.xerial:sqlite-jdbc:3.44.1.0'
+            force 'com.google.code.gson:gson:2.10.1'
+            force 'org.json:json:20231013'
+        }
+    }
+}
+
+ext.forceVersions = this.&forceVersions