Merge branch 'develop' into bugfix/cmr/extended-character-filename

Author: christianrowlands

.github/workflows/build.yml

@@ -28,11 +28,11 @@ jobs:
         with:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -57,11 +57,11 @@ jobs:
         with:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:

.github/workflows/nightly.yml

@@ -20,11 +20,11 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:

.github/workflows/post-pr.yml

@@ -44,11 +44,11 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:

.github/workflows/quality.yml

@@ -25,11 +25,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -48,11 +48,11 @@ jobs:
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v4
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -102,11 +102,11 @@ jobs:
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v4
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:

.github/workflows/tests.yml

@@ -29,11 +29,11 @@ jobs:
         with:
           lfs: true
           fetch-depth: 0
-      - name: Use JDK 17
+      - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '21'
       - name: Configure gradle
         uses: gradle/actions/setup-gradle@v3
         with:
@@ -139,11 +139,11 @@ jobs:
 #      cancel-in-progress: true
 #    steps:
 #      - uses: actions/checkout@v4
-#      - name: Use JDK 17
+#      - name: Use JDK 21
 #        uses: actions/setup-java@v4
 #        with:
 #          distribution: 'temurin' # See 'Supported distributions' for available options
-#          java-version: '17'
+#          java-version: '21'
 #      - name: Configure gradle
 #        uses: gradle/actions/setup-gradle@v3
 #        with:

build.gradle

@@ -43,7 +43,7 @@ plugins {
     // ktlint Plugin
     id "org.jlleitschuh.gradle.ktlint" version "11.3.2"
     // Detekt
-    id "io.gitlab.arturbosch.detekt" version "1.22.0"
+    id "io.gitlab.arturbosch.detekt" version "1.23.7"
     // Ksp
     id "com.google.devtools.ksp" version "1.9.24-1.0.20"
 

dependencies.gradle

@@ -2,9 +2,9 @@ ext.versions = [
         'minSdk'            : 21,
         'compileSdk'        : 34,
         'targetSdk'         : 34,
-        'sourceCompat'      : JavaVersion.VERSION_17,
-        'targetCompat'      : JavaVersion.VERSION_17,
-        'jvmTarget'         : "17",
+        'sourceCompat'      : JavaVersion.VERSION_21,
+        'targetCompat'      : JavaVersion.VERSION_21,
+        'jvmTarget'         : "21",
 ]
 
 def gradle = "8.4.2"

dependencies_groups.gradle

@@ -203,6 +203,7 @@ ext.groups = [
                         'org.jacoco',
                         'org.java-websocket',
                         'org.jcodec',
+                        'org.jcommander',
                         'org.jetbrains',
                         'org.jetbrains.dokka',
                         'org.jetbrains.intellij.deps',
@@ -229,6 +230,7 @@ ext.groups = [
                         'org.reactivestreams',
                         'org.robolectric',
                         'org.slf4j',
+                        'org.snakeyaml',
                         'org.sonatype.oss',
                         'org.testng',
                         'org.threeten',

library/external/realmfieldnameshelper/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'kotlin'
 apply plugin: 'java'
 
 sourceCompatibility = versions.sourceCompat
-targetCompatibility = versions.sourceCompat
+targetCompatibility = versions.targetCompat
 
 dependencies {
     implementation 'com.squareup:javapoet:1.13.0'

library/external/textdrawable/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: 'com.android.library'
 
-apply plugin: 'com.android.library'
-
 android {
     namespace "com.amulyakhare.textdrawable"
 

library/ui-strings/src/main/res/values/strings.xml

@@ -652,6 +652,8 @@
 
     <string name="call_remove_jitsi_widget_progress">Ending call…</string>
 
+    <string name="microphone_in_use_title">Microphone in use</string>
+
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->

tools/detekt/detekt.yml

@@ -25,6 +25,8 @@ style:
     active: false
   UseCheckOrError:
     active: false
+  UnusedPrivateProperty:
+    active: false
 
 empty-blocks:
   EmptyFunctionBlock:
@@ -75,6 +77,8 @@ naming:
 performance:
   SpreadOperator:
     active: false
+  ForEachOnRange:
+    active: false
 
 # Note: all rules for `comments` are disabled by default, but I put them here to be aware of their existence
 comments:
@@ -91,7 +95,7 @@ comments:
   EndOfSentenceFormat:
     active: true
   OutdatedDocumentation:
-    active: true
+    active: false
   UndocumentedPublicClass:
     active: false
   UndocumentedPublicFunction: