chore(deps): bump gradle deps (#22344)

bump deps

mobile/android/build.gradle

@@ -1,5 +1,5 @@
 allprojects {
-    ext.kotlin_version = '2.0.20' 
+    ext.kotlin_version = '2.2.20'
 
     repositories {
         google()
@@ -16,8 +16,8 @@ subprojects {
         if (project.plugins.hasPlugin("com.android.application") ||
                 project.plugins.hasPlugin("com.android.library")) {
             project.android {
-                compileSdkVersion 35
-                buildToolsVersion "35.0.0"
+                compileSdkVersion 36
+                buildToolsVersion "36.0.0"
             }
         }
     }

mobile/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

mobile/android/settings.gradle

@@ -18,10 +18,10 @@ pluginManagement {
 
 plugins {
   id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-  id "com.android.application" version '8.7.2' apply false
-  id "org.jetbrains.kotlin.android" version "2.0.20" apply false
+  id "com.android.application" version '8.11.2' apply false
+  id "org.jetbrains.kotlin.android" version "2.2.20" apply false
   id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.22' apply false
-  id 'com.google.devtools.ksp' version '2.0.20-1.0.24' apply false
+  id 'com.google.devtools.ksp' version '2.2.20-2.0.3' apply false
 }
 
 include ":app"

server/src/repositories/media.repository.ts

@@ -203,9 +203,6 @@ export class MediaRepository {
           isHDR: stream.color_transfer === 'smpte2084' || stream.color_transfer === 'arib-std-b67',
           bitrate: this.parseInt(stream.bit_rate),
           pixelFormat: stream.pix_fmt || 'yuv420p',
-          colorPrimaries: stream.color_primaries,
-          colorSpace: stream.color_space,
-          colorTransfer: stream.color_transfer,
         })),
       audioStreams: results.streams
         .filter((stream) => stream.codec_type === 'audio')

server/src/services/media.service.spec.ts

@@ -445,7 +445,6 @@ describe(MediaService.name, () => {
         }),
       );
     });
-
     it('should not skip intra frames for MTS file', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStreamMTS);
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.video);
@@ -463,25 +462,6 @@ describe(MediaService.name, () => {
       );
     });
 
-    it('should override reserved color metadata', async () => {
-      mocks.media.probe.mockResolvedValue(probeStub.videoStreamReserved);
-      mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.video);
-      await sut.handleGenerateThumbnails({ id: assetStub.video.id });
-
-      expect(mocks.media.transcode).toHaveBeenCalledWith(
-        '/original/path.ext',
-        expect.any(String),
-        expect.objectContaining({
-          inputOptions: expect.arrayContaining([
-            '-bsf:v hevc_metadata=colour_primaries=1:matrix_coefficients=1:transfer_characteristics=1',
-          ]),
-          outputOptions: expect.any(Array),
-          progress: expect.any(Object),
-          twoPass: false,
-        }),
-      );
-    });
-
     it('should use scaling divisible by 2 even when using quick sync', async () => {
       mocks.media.probe.mockResolvedValue(probeStub.videoStream2160p);
       mocks.systemMetadata.get.mockResolvedValue({ ffmpeg: { accel: TranscodeHardwareAcceleration.Qsv } });

server/src/types.ts

@@ -88,9 +88,6 @@ export interface VideoStreamInfo {
   isHDR: boolean;
   bitrate: number;
   pixelFormat: string;
-  colorPrimaries?: string;
-  colorSpace?: string;
-  colorTransfer?: string;
 }
 
 export interface AudioStreamInfo {

server/src/utils/media.ts

@@ -392,30 +392,9 @@ export class ThumbnailConfig extends BaseConfig {
 
   getBaseInputOptions(videoStream: VideoStreamInfo, format?: VideoFormat): string[] {
     // skip_frame nointra skips all frames for some MPEG-TS files. Look at ffmpeg tickets 7950 and 7895 for more details.
-    const options =
-      format?.formatName === 'mpegts'
-        ? ['-sws_flags accurate_rnd+full_chroma_int']
-        : ['-skip_frame nointra', '-sws_flags accurate_rnd+full_chroma_int'];
-
-    const metadataOverrides = [];
-    if (videoStream.colorPrimaries === 'reserved') {
-      metadataOverrides.push('colour_primaries=1');
-    }
-
-    if (videoStream.colorSpace === 'reserved') {
-      metadataOverrides.push('matrix_coefficients=1');
-    }
-
-    if (videoStream.colorTransfer === 'reserved') {
-      metadataOverrides.push('transfer_characteristics=1');
-    }
-
-    if (metadataOverrides.length > 0) {
-      // workaround for https://fftrac-bg.ffmpeg.org/ticket/11020
-      options.push(`-bsf:v ${videoStream.codecName}_metadata=${metadataOverrides.join(':')}`);
-    }
-
-    return options;
+    return format?.formatName === 'mpegts'
+      ? ['-sws_flags accurate_rnd+full_chroma_int']
+      : ['-skip_frame nointra', '-sws_flags accurate_rnd+full_chroma_int'];
   }
 
   getBaseOutputOptions() {

server/test/fixtures/media.stub.ts

@@ -261,15 +261,4 @@ export const probeStub = {
       bitrate: 0,
     },
   }),
-  videoStreamReserved: Object.freeze<VideoInfo>({
-    ...probeStubDefault,
-    videoStreams: [
-      {
-        ...probeStubDefaultVideoStream[0],
-        colorPrimaries: 'reserved',
-        colorSpace: 'reserved',
-        colorTransfer: 'reserved',
-      },
-    ],
-  }),
 };