Upgrade dependenices: AGP to 7.2.2 + ExoPlayer to 2.18.1 + camerax to 1.1.0 + ReLinker to 1.4.5 + checkerframework to 3.24.0

Author: vkryl

app/build.gradle.kts

@@ -185,9 +185,9 @@ dependencies {
   implementation("androidx.interpolator:interpolator:1.0.0")
   implementation("androidx.gridlayout:gridlayout:1.0.0")
   // CameraX: https://developer.android.com/jetpack/androidx/releases/camera
-  implementation("androidx.camera:camera-camera2:1.1.0-beta01")
-  implementation("androidx.camera:camera-lifecycle:1.1.0-beta01")
-  implementation("androidx.camera:camera-view:1.1.0-beta01")
+  implementation("androidx.camera:camera-camera2:1.1.0")
+  implementation("androidx.camera:camera-lifecycle:1.1.0")
+  implementation("androidx.camera:camera-view:1.1.0")
   // Google Play Services: https://developers.google.com/android/guides/releases
   implementation("com.google.android.gms:play-services-base:17.6.0")
   implementation("com.google.android.gms:play-services-basement:17.6.0")
@@ -203,15 +203,15 @@ dependencies {
   // Play In-App Updates: https://developer.android.com/reference/com/google/android/play/core/release-notes-in_app_updates
   implementation("com.google.android.play:app-update:2.0.0")
   // ExoPlayer: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
-  implementation("com.google.android.exoplayer:exoplayer-core:2.17.1")
+  implementation("com.google.android.exoplayer:exoplayer-core:2.18.1")
   // The Checker Framework: https://checkerframework.org/CHANGELOG.md
-  compileOnly("org.checkerframework:checker-qual:3.21.1")
+  compileOnly("org.checkerframework:checker-qual:3.24.0")
   // OkHttp: https://github.com/square/okhttp/blob/master/CHANGELOG.md
   implementation("com.squareup.okhttp3:okhttp:4.9.3")
   // ShortcutBadger: https://github.com/leolin310148/ShortcutBadger
   implementation("me.leolin:ShortcutBadger:1.1.22@aar")
   // ReLinker: https://github.com/KeepSafe/ReLinker/blob/master/CHANGELOG.md
-  implementation("com.getkeepsafe.relinker:relinker:1.4.4")
+  implementation("com.getkeepsafe.relinker:relinker:1.4.5")
   // Konfetti: https://github.com/DanielMartinus/Konfetti/blob/master/README.md
   implementation("nl.dionsegijn:konfetti-xml:2.0.1")
   // Transcoder: https://github.com/natario1/Transcoder/blob/master/docs/_about/changelog.md

app/src/main/java/org/thunderdog/challegram/player/AudioController.java

@@ -33,12 +33,11 @@
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 
 import org.drinkless.td.libcore.telegram.TdApi;
 import org.thunderdog.challegram.Log;
@@ -717,13 +716,14 @@ public void seekTo (long positionMillis, long durationMillis) {
   // ExoPlayer
 
   @Override
-  public void onTimelineChanged (Timeline timeline, int reason) {
+  public void onTimelineChanged (@NonNull Timeline timeline, int reason) {
     Log.d(Log.TAG_PLAYER, "[state] onTimeLineChanged reason:%d", reason);
   }
 
-  private static ApicFrame findApic (TrackGroupArray trackGroups) {
-    for (int i = 0; i < trackGroups.length; i++) {
-      TrackGroup trackGroup = trackGroups.get(i);
+  private static ApicFrame findApic (@NonNull Tracks tracks) {
+    List<Tracks.Group> groups = tracks.getGroups();
+    for (Tracks.Group group : groups) {
+      TrackGroup trackGroup = group.getMediaTrackGroup();
       for (int j = 0; j < trackGroup.length; j++) {
         Metadata trackMetadata = trackGroup.getFormat(j).metadata;
         if (trackMetadata != null) {
@@ -741,7 +741,7 @@ private static ApicFrame findApic (TrackGroupArray trackGroups) {
   }
 
   @Override
-  public void onTracksChanged (TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+  public void onTracksChanged (@NonNull Tracks trackGroups) {
     Log.d(Log.TAG_PLAYER, "[state] onTracksChanged");
     if (playbackMode != PLAYBACK_MODE_EXOPLAYER_LIST || playIndex == -1) {
       return;
@@ -757,7 +757,7 @@ private void checkApicDelayed () {
       if (playIndex != -1 && playIndex >= 0 && playIndex < playList.size()) {
         TdApi.Message track = playList.get(playIndex);
         if (!TGPlayerController.compareTracks(currentApicMessage, track)) {
-          ApicFrame frame = findApic(exoPlayer.getCurrentTrackGroups());
+          ApicFrame frame = findApic(exoPlayer.getCurrentTracks());
           if (frame != null) {
             dispatchApic(tdlib, track, frame);
           }
@@ -1058,7 +1058,7 @@ public ApicFrame requestApic (Tdlib tdlib, TdApi.Message message, ApicListener l
 
   private void setExoPlayerParameters () {
     if (exoPlayer != null) {
-      context.player().proximityManager().modifyExoPlayer(exoPlayer, C.CONTENT_TYPE_MUSIC);
+      context.player().proximityManager().modifyExoPlayer(exoPlayer, C.AUDIO_CONTENT_TYPE_MUSIC);
     }
   }
 

app/src/main/java/org/thunderdog/challegram/player/ProximityManager.java

@@ -336,7 +336,7 @@ private void setWakeLockHeld (boolean wakeLockHeld) {
 
   public void modifyExoPlayer (ExoPlayer exoPlayer, @C.AudioContentType int contentType) {
     if (needPlayThroughEarpiece()) {
-      exoPlayer.setAudioAttributes(new AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_SPEECH).setUsage(C.USAGE_VOICE_COMMUNICATION).build(), false);
+      exoPlayer.setAudioAttributes(new AudioAttributes.Builder().setContentType(C.AUDIO_CONTENT_TYPE_SPEECH).setUsage(C.USAGE_VOICE_COMMUNICATION).build(), false);
     } else {
       exoPlayer.setAudioAttributes(new AudioAttributes.Builder().setContentType(contentType).setUsage(C.USAGE_MEDIA).build(), false);
     }

buildSrc/build.gradle.kts

@@ -45,7 +45,7 @@ configurations.all {
 
 dependencies {
   compileOnly(gradleApi())
-  implementation("com.android.tools.build:gradle:7.2.0")
+  implementation("com.android.tools.build:gradle:7.2.2")
   implementation("com.google.gms:google-services:4.3.13")
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
   implementation("com.squareup.okhttp3:okhttp:4.9.3")