Merge pull request #294 from PatrykMis/patch-230414

Bump AGP to 8.0.0

CHANGELOG.md

@@ -1,6 +1,6 @@
 ### Unreleased
 
-* Update all dependencies (PR: #289, @PatrykMis)
+* Update all dependencies (PR: #289, #294, @PatrykMis)
 * Improve conference call handling (PR: #285, @chenxiaolong)
   * Recording a conference call will no longer incorrectly produce extra files for each participant in the call.
   * When using call waiting, the recording is paused for the inactive call so that it doesn't capture the audio for the wrong call.

app/.gitignore

@@ -1 +1 @@
-/build
+/build

app/build.gradle.kts

@@ -181,6 +181,7 @@ android {
         jvmTarget = "11"
     }
     buildFeatures {
+        buildConfig = true
         viewBinding = true
     }
 }

app/magisk/updates/release/info.json

@@ -3,4 +3,4 @@
     "changelog": "https://github.com/chenxiaolong/BCR/raw/v1.39/app/magisk/updates/release/changelog.txt",
     "version": "1.39",
     "versionCode": 75520
-}
+}

app/src/androidTest/java/com/chiller3/bcr/ExampleInstrumentedTest.kt

@@ -21,4 +21,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.chiller3.bcr", appContext.packageName)
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -81,4 +81,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>

app/src/main/java/com/chiller3/bcr/AudioFormatExtension.kt

@@ -10,4 +10,4 @@ val AudioFormat.frameSizeInBytesCompat: Int
         // Hardcoded for Android 9 compatibility only
         assert(encoding == AudioFormat.ENCODING_PCM_16BIT)
         2 * channelCount
-    }
+    }

app/src/main/java/com/chiller3/bcr/ChipGroupCentered.kt

@@ -137,4 +137,4 @@ class ChipGroupCentered(context: Context, attrs: AttributeSet?, defStyleAttr: In
             }
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/FilenameTemplate.kt

@@ -138,4 +138,4 @@ class FilenameTemplate private constructor(props: Properties) {
             }
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/LongClickablePreference.kt

@@ -22,4 +22,4 @@ class LongClickablePreference(context: Context, attrs: AttributeSet?) : Preferen
     interface OnPreferenceLongClickListener {
         fun onPreferenceLongClick(preference: Preference): Boolean
     }
-}
+}

app/src/main/java/com/chiller3/bcr/NotificationActionService.kt

@@ -89,4 +89,4 @@ class NotificationActionService : Service() {
 
             START_NOT_STICKY
         }
-}
+}

app/src/main/java/com/chiller3/bcr/Notifications.kt

@@ -340,4 +340,4 @@ class Notifications(
             }
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/OpenPersistentDocumentTree.kt

@@ -21,4 +21,4 @@ class OpenPersistentDocumentTree : ActivityResultContracts.OpenDocumentTree() {
 
         return intent
     }
-}
+}

app/src/main/java/com/chiller3/bcr/OutputDirUtils.kt

@@ -130,4 +130,4 @@ class OutputDirUtils(private val context: Context, private val redactor: Redacto
 
         fun redact(uri: Uri): String
     }
-}
+}

app/src/main/java/com/chiller3/bcr/OutputDirectoryBottomSheetFragment.kt

@@ -78,4 +78,4 @@ class OutputDirectoryBottomSheetFragment : BottomSheetDialogFragment(), Slider.O
     companion object {
         val TAG: String = OutputDirectoryBottomSheetFragment::class.java.simpleName
     }
-}
+}

app/src/main/java/com/chiller3/bcr/OutputFormatBottomSheetFragment.kt

@@ -173,4 +173,4 @@ class OutputFormatBottomSheetFragment : BottomSheetDialogFragment(),
     companion object {
         val TAG: String = OutputFormatBottomSheetFragment::class.java.simpleName
     }
-}
+}

app/src/main/java/com/chiller3/bcr/Permissions.kt

@@ -60,4 +60,4 @@ object Permissions {
         intent.data = Uri.fromParts("package", context.packageName, null)
         return intent
     }
-}
+}

app/src/main/java/com/chiller3/bcr/Preferences.kt

@@ -215,4 +215,4 @@ class Preferences(private val context: Context) {
     var sampleRate: SampleRate?
         get() = getOptionalUint(PREF_SAMPLE_RATE)?.let { SampleRate(it) }
         set(sampleRate) = setOptionalUint(PREF_SAMPLE_RATE, sampleRate?.value)
-}
+}

app/src/main/java/com/chiller3/bcr/RecorderApplication.kt

@@ -42,4 +42,4 @@ class RecorderApplication : Application() {
     companion object {
         private val TAG = RecorderApplication::class.java.simpleName
     }
-}
+}

app/src/main/java/com/chiller3/bcr/RecorderInCallService.kt

@@ -327,4 +327,4 @@ class RecorderInCallService : InCallService(), RecorderThread.OnRecordingComplet
             notifyFailure(errorMsg, file)
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/RecorderProvider.kt

@@ -77,4 +77,4 @@ class RecorderProvider : ContentProvider() {
         selection: String?,
         selectionArgs: Array<String>?,
     ): Int = 0
-}
+}

app/src/main/java/com/chiller3/bcr/RecorderThread.kt

@@ -800,4 +800,4 @@ class RecorderThread(
          */
         fun onRecordingFailed(thread: RecorderThread, errorMsg: String?, file: OutputFile?)
     }
-}
+}

app/src/main/java/com/chiller3/bcr/RecorderTileService.kt

@@ -61,4 +61,4 @@ class RecorderTileService : TileService(), SharedPreferences.OnSharedPreferenceC
 
         tile.updateTile()
     }
-}
+}

app/src/main/java/com/chiller3/bcr/SettingsActivity.kt

@@ -218,4 +218,4 @@ class SettingsActivity : AppCompatActivity() {
             }
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/UriExtensions.kt

@@ -26,4 +26,4 @@ val Uri.formattedString: String
             }
         }
         else -> toString()
-    }
+    }

app/src/main/java/com/chiller3/bcr/format/AacFormat.kt

@@ -39,4 +39,4 @@ object AacFormat : Format() {
 
     override fun getContainer(fd: FileDescriptor): Container =
         MediaMuxerContainer(fd, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4)
-}
+}

app/src/main/java/com/chiller3/bcr/format/Encoder.kt

@@ -45,4 +45,4 @@ abstract class Encoder(
      * @param isEof No more data can be submitted after this method is called once with EOF == true.
      */
     abstract fun encode(buffer: ByteBuffer, isEof: Boolean)
-}
+}

app/src/main/java/com/chiller3/bcr/format/FlacContainer.kt

@@ -150,4 +150,4 @@ class FlacContainer(private val fd: FileDescriptor) : Container {
         private val TAG = FlacContainer::class.java.simpleName
         private val FLAC_MAGIC = ubyteArrayOf(0x66u, 0x4cu, 0x61u, 0x43u) // fLaC
     }
-}
+}

app/src/main/java/com/chiller3/bcr/format/FlacFormat.kt

@@ -27,4 +27,4 @@ object FlacFormat : Format() {
 
     override fun getContainer(fd: FileDescriptor): Container =
         FlacContainer(fd)
-}
+}

app/src/main/java/com/chiller3/bcr/format/Format.kt

@@ -116,4 +116,4 @@ sealed class Format {
             return Pair(format, param)
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/format/FormatParamInfo.kt

@@ -74,4 +74,4 @@ object NoParamInfo : FormatParamInfo(0u) {
     override fun toNearest(param: UInt): UInt = param
 
     override fun format(param: UInt): String = ""
-}
+}

app/src/main/java/com/chiller3/bcr/format/MediaCodecEncoder.kt

@@ -125,4 +125,4 @@ class MediaCodecEncoder(
             return codec
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/format/MediaMuxerContainer.kt

@@ -33,4 +33,4 @@ class MediaMuxerContainer(
     override fun writeSamples(trackIndex: Int, byteBuffer: ByteBuffer,
                               bufferInfo: MediaCodec.BufferInfo) =
         muxer.writeSampleData(trackIndex, byteBuffer, bufferInfo)
-}
+}

app/src/main/java/com/chiller3/bcr/format/OpusFormat.kt

@@ -32,4 +32,4 @@ object OpusFormat : Format() {
     @RequiresApi(Build.VERSION_CODES.Q)
     override fun getContainer(fd: FileDescriptor): Container =
         MediaMuxerContainer(fd, MediaMuxer.OutputFormat.MUXER_OUTPUT_OGG)
-}
+}

app/src/main/java/com/chiller3/bcr/format/PassthroughEncoder.kt

@@ -63,4 +63,4 @@ class PassthroughEncoder(
 
         numFrames += frames
     }
-}
+}

app/src/main/java/com/chiller3/bcr/format/SampleRate.kt

@@ -39,4 +39,4 @@ value class SampleRate(val value: UInt) {
             return default
         }
     }
-}
+}

app/src/main/java/com/chiller3/bcr/format/WaveContainer.kt

@@ -129,4 +129,4 @@ class WaveContainer(private val fd: FileDescriptor) : Container {
         private val FMT_MAGIC = ubyteArrayOf(0x66u, 0x6du, 0x74u, 0x20u) // "fmt "
         private val DATA_MAGIC = ubyteArrayOf(0x64u, 0x61u, 0x74u, 0x61u) // data
     }
-}
+}

app/src/main/java/com/chiller3/bcr/format/WaveFormat.kt

@@ -21,4 +21,4 @@ object WaveFormat : Format() {
 
     override fun getContainer(fd: FileDescriptor): Container =
         WaveContainer(fd)
-}
+}

app/src/main/res/layout/bottom_sheet_chip.xml

@@ -2,4 +2,4 @@
 <com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/Widget.Material3.Chip.Filter"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
+    android:layout_height="wrap_content" />

app/src/main/res/layout/output_directory_bottom_sheet.xml

@@ -53,4 +53,4 @@
             android:text="@string/bottom_sheet_reset"
             style="?attr/materialButtonOutlinedStyle" />
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>

app/src/main/res/layout/output_format_bottom_sheet.xml

@@ -69,4 +69,4 @@
             android:text="@string/bottom_sheet_reset"
             style="?attr/materialButtonOutlinedStyle" />
     </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>

app/src/main/res/layout/settings_activity.xml

@@ -12,4 +12,4 @@
         android:id="@+id/settings"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</LinearLayout>
+</LinearLayout>

app/src/main/res/mipmap-anydpi/ic_launcher.xml

@@ -3,4 +3,4 @@
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi/ic_launcher_round.xml

@@ -3,4 +3,4 @@
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
     <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/values-iw/strings.xml

@@ -63,4 +63,4 @@
 
     <!-- Quick settings tile -->
     <string name="quick_settings_label">הקלטת שיחה</string>
-</resources>
+</resources>

app/src/main/res/values/dimens.xml

@@ -3,4 +3,4 @@
     <dimen name="bottom_sheet_overall_padding">28dp</dimen>
     <dimen name="bottom_sheet_title_margin_bottom">16dp</dimen>
     <dimen name="bottom_sheet_section_separation">28dp</dimen>
-</resources>
+</resources>

app/src/main/res/values/themes.xml

@@ -5,4 +5,4 @@
         <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
-</resources>
+</resources>

app/src/main/res/xml/root_preferences.xml

@@ -47,4 +47,4 @@
             app:title="@string/pref_version_name"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
-</PreferenceScreen>
+</PreferenceScreen>

app/src/test/java/com/chiller3/bcr/ExampleUnitTest.kt

@@ -14,4 +14,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
+}

build.gradle.kts

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "7.4.2" apply false
-    id("com.android.library") version "7.4.2" apply false
+    id("com.android.application") version "8.0.0" apply false
+    id("com.android.library") version "8.0.0" apply false
     id("org.jetbrains.kotlin.android") version "1.8.20" apply false
 }
 

gradle.properties

@@ -17,7 +17,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true