Update all dependencies

For now, we temporarily disable dex optimizations because AGP 8.2 and newer miscompile MediaCodecEncoder.encode(), causing a byte code verification exception to be thrown when recording a call. Upstream bug report: https://issuetracker.google.com/issues/334275655 Signed-off-by: Andrew Gunnerson <[email protected]>
chenxiaolong · Apr 16, 2024 · b40c6af · b40c6af
1 parent cd14c13
commit b40c6af
Show file tree

Hide file tree

Showing 7 changed files with 820 additions and 784 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -181,7 +181,11 @@ android {
 
             isMinifyEnabled = true
             isShrinkResources = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            // Optimizations currently result in a miscompilation of MediaCodecEncoder.encode()
+            // with AGP 8.2.x and newer. Until this is fixed, let's disable optimizations entirely.
+            //
+            // Upstream bug report: https://issuetracker.google.com/issues/334275655
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
 
             signingConfig = signingConfigs.getByName("release")
         }

diff --git a/app/src/main/java/com/chiller3/bcr/RecorderTileService.kt b/app/src/main/java/com/chiller3/bcr/RecorderTileService.kt
@@ -1,5 +1,6 @@
 package com.chiller3.bcr
 
+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.content.SharedPreferences
@@ -33,6 +34,7 @@ class RecorderTileService : TileService(), SharedPreferences.OnSharedPreferenceC
         prefs.unregisterOnSharedPreferenceChangeListener(this)
     }
 
+    @SuppressLint("StartActivityAndCollapseDeprecated")
     override fun onClick() {
         super.onClick()
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
-android-gradle-plugin = "8.1.3"
+android-gradle-plugin = "8.3.2"
 androidx-activity = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-core = "1.12.0"
 androidx-documentfile = "1.0.1"
 androidx-fragment = "1.6.2"
 androidx-preference = "1.2.1"
-jgit = "6.7.0.202309050840-r"
-json = "20231013"
-kotlin = "1.9.20"
-kudzu = "5.1.0"
+jgit = "6.9.0.202403050737-r"
+json = "20240303"
+kotlin = "1.9.23"
+kudzu = "5.2.0"
 material = "1.11.0"
 test-junit = "4.13.2"
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail