Merge remote-tracking branch 'origin/main' into fix/help-menu

NathanWalker · NathanWalker · commit 2226a0d53553 · 2025-11-08T09:01:57.000-08:00
diff --git a/vendor/aab-tool/README.txt b/vendor/aab-tool/README.txt
@@ -1 +1 @@
-Downloaded from https://github.com/google/bundletool/releases/tag/1.15.6
+Downloaded from https://github.com/google/bundletool/releases/tag/1.18.2
diff --git a/vendor/aab-tool/bundletool.jar b/vendor/aab-tool/bundletool.jar
diff --git a/vendor/gradle-plugin/build.gradle b/vendor/gradle-plugin/build.gradle
@@ -30,7 +30,7 @@ buildscript {
     def getDepPlatformDir = { dep ->
         file("${project.ext.USER_PROJECT_PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")
     }
-    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "2.0.0" }
+    def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "2.2.20" }
     def kotlinVersion = computeKotlinVersion()
     repositories {
         google()

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Downloaded from https://github.com/google/bundletool/releases/tag/1.15.6`
	`1`	`+Downloaded from https://github.com/google/bundletool/releases/tag/1.18.2`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ buildscript {`
`30`	`30`	`def getDepPlatformDir = { dep ->`
`31`	`31`	`file("${project.ext.USER_PROJECT_PLATFORMS_ANDROID}/${dep.directory}/$PLATFORMS_ANDROID")`
`32`	`32`	`}`
`33`		`- def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "2.0.0" }`
	`33`	`+ def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "2.2.20" }`
`34`	`34`	`def kotlinVersion = computeKotlinVersion()`
`35`	`35`	`repositories {`
`36`	`36`	`google()`