feat: update android tools

OutSystems · Nov 21, 2024 · 13c8a49 · 13c8a49
1 parent 97b3e06
commit 13c8a49
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/framework/cdv-gradle-config-defaults.json b/framework/cdv-gradle-config-defaults.json
@@ -1,15 +1,15 @@
 {
-    "MIN_SDK_VERSION": 28,
+    "MIN_SDK_VERSION": 29,
     "SDK_VERSION": 35,
     "COMPILE_SDK_VERSION": null,
-    "GRADLE_VERSION": "8.7",
+    "GRADLE_VERSION": "8.11.1",
     "MIN_BUILD_TOOLS_VERSION": "35.0.0",
-    "AGP_VERSION": "8.3.0",
+    "AGP_VERSION": "8.7.2",
     "KOTLIN_VERSION": "1.9.24",
-    "ANDROIDX_APP_COMPAT_VERSION": "1.6.1",
-    "ANDROIDX_WEBKIT_VERSION": "1.8.0",
+    "ANDROIDX_APP_COMPAT_VERSION": "1.7.0",
+    "ANDROIDX_WEBKIT_VERSION": "1.12.1",
     "ANDROIDX_CORE_SPLASHSCREEN_VERSION": "1.0.1",
-    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.4.0",
+    "GRADLE_PLUGIN_GOOGLE_SERVICES_VERSION": "4.4.2",
     "IS_GRADLE_PLUGIN_GOOGLE_SERVICES_ENABLED": false,
     "IS_GRADLE_PLUGIN_KOTLIN_ENABLED": true,
     "PACKAGE_NAMESPACE": "io.cordova.helloCordova",

diff --git a/spec/fixtures/android_studio_project/gradle/wrapper/gradle-wrapper.properties b/spec/fixtures/android_studio_project/gradle/wrapper/gradle-wrapper.properties
@@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
diff --git a/templates/project/app/build.gradle b/templates/project/app/build.gradle
@@ -335,7 +335,16 @@ dependencies {
     implementation "androidx.core:core-splashscreen:${cordovaConfig.ANDROIDX_CORE_SPLASHSCREEN_VERSION}"
 
     if (cordovaConfig.IS_GRADLE_PLUGIN_KOTLIN_ENABLED) {
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${cordovaConfig.KOTLIN_VERSION}"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib:${cordovaConfig.KOTLIN_VERSION}"
+    }
+
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${cordovaConfig.KOTLIN_VERSION}") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${cordovaConfig.KOTLIN_VERSION}") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
     }
 
     // SUB-PROJECT DEPENDENCIES START