bump gradle, agp and deps

trynoice · Oct 1, 2023 · 6ad78e0 · 6ad78e0
1 parent ea3cbb7
commit 6ad78e0
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 31 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,6 +2,7 @@ plugins {
   id 'com.android.application'
   id 'org.jetbrains.kotlin.android'
   id 'org.jetbrains.kotlin.kapt'
+  id 'com.google.devtools.ksp'
 
   id 'androidx.navigation.safeargs.kotlin'
   id 'com.google.dagger.hilt.android'
@@ -67,10 +68,8 @@ android {
     freeCompilerArgs += ["-opt-in=androidx.paging.ExperimentalPagingApi"]
   }
 
-  kapt {
-    arguments {
-      arg("room.schemaLocation", "$projectDir/schemas")
-    }
+  ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
   }
 
   packagingOptions {
@@ -93,19 +92,19 @@ project.afterEvaluate {
 dependencies {
   def androidXHiltVersion = '1.0.0'
   def fragmentVersion = '1.6.1'
-  def media3Version = '1.1.0'
+  def media3Version = '1.1.1'
   def roomVersion = '2.5.2'
   def workManagerVersion = '2.8.1'
 
   def espressoVersion = '3.5.1'
-  def mockkVersion = '1.13.3'
+  def mockkVersion = '1.13.8'
 
   kapt "com.google.dagger:hilt-compiler:$deps.hiltVersion"
   kapt "androidx.hilt:hilt-compiler:$androidXHiltVersion"
-  kapt "androidx.room:room-compiler:$roomVersion"
+  ksp "androidx.room:room-compiler:$roomVersion"
 
   implementation 'androidx.appcompat:appcompat:1.6.1'
-  implementation 'androidx.browser:browser:1.5.0'
+  implementation 'androidx.browser:browser:1.6.0'
   implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
   implementation "androidx.core:core-ktx:$deps.androidXCoreVersion"
   implementation "androidx.fragment:fragment-ktx:$fragmentVersion"
@@ -119,8 +118,8 @@ dependencies {
   implementation "androidx.media3:media3-session:$media3Version"
   implementation "androidx.navigation:navigation-fragment-ktx:$deps.navVersion"
   implementation "androidx.navigation:navigation-ui-ktx:$deps.navVersion"
-  implementation 'androidx.paging:paging-runtime-ktx:3.2.0'
-  implementation 'androidx.preference:preference-ktx:1.2.0'
+  implementation 'androidx.paging:paging-runtime-ktx:3.2.1'
+  implementation 'androidx.preference:preference-ktx:1.2.1'
   implementation 'androidx.recyclerview:recyclerview:1.3.1'
   implementation "androidx.room:room-ktx:$roomVersion"
   implementation "androidx.room:room-paging:$roomVersion"
@@ -139,7 +138,7 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$deps.coroutinesVersion"
   implementation project(":api-client")
 
-  fullImplementation 'androidx.mediarouter:mediarouter:1.4.0'
+  fullImplementation 'androidx.mediarouter:mediarouter:1.6.0'
   fullImplementation 'com.android.billingclient:billing-ktx:6.0.1'
   fullImplementation 'com.google.android.gms:play-services-base:18.2.0'
   fullImplementation 'com.google.android.gms:play-services-cast-framework:21.3.0'

diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/engine/SoundPlaybackMediaSession.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/engine/SoundPlaybackMediaSession.kt
@@ -216,10 +216,6 @@ class SoundPlaybackMediaSession(context: Context, sessionActivityPi: PendingInte
             .buildUpon()
             .removeAll(
               Player.COMMAND_GET_DEVICE_VOLUME,
-              // TODO: Continue using deprecated commands until clarification.
-              //  https://github.com/androidx/media/issues/554
-              Player.COMMAND_SET_DEVICE_VOLUME,
-              Player.COMMAND_ADJUST_DEVICE_VOLUME,
               Player.COMMAND_SET_DEVICE_VOLUME_WITH_FLAGS,
               Player.COMMAND_ADJUST_DEVICE_VOLUME_WITH_FLAGS,
             )
@@ -238,10 +234,6 @@ class SoundPlaybackMediaSession(context: Context, sessionActivityPi: PendingInte
             .buildUpon()
             .addAll(
               Player.COMMAND_GET_DEVICE_VOLUME,
-              // TODO: Continue using deprecated commands until clarification.
-              //  https://github.com/androidx/media/issues/554
-              Player.COMMAND_SET_DEVICE_VOLUME,
-              Player.COMMAND_ADJUST_DEVICE_VOLUME,
               Player.COMMAND_SET_DEVICE_VOLUME_WITH_FLAGS,
               Player.COMMAND_ADJUST_DEVICE_VOLUME_WITH_FLAGS,
             )

diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@ plugins {
   id 'com.android.library' version "${agpVersion}" apply false
   id 'org.jetbrains.kotlin.android' version "${kotlinVersion}" apply false
   id 'org.jetbrains.kotlin.kapt' version "${kotlinVersion}" apply false
+  id 'com.google.devtools.ksp' version "1.9.10-1.0.13" apply false
 
   id 'androidx.navigation.safeargs.kotlin' version "${navVersion}" apply false
   id 'com.google.dagger.hilt.android' version "${hiltVersion}" apply false
@@ -18,11 +19,11 @@ plugins {
 project.ext {
   deps = [
     aboutLibrariesVersion: "${aboutLibrariesVersion}",
-    androidXCoreVersion  : '1.10.1',
+    androidXCoreVersion  : '1.12.0',
     coroutinesVersion    : '1.7.3',
     hiltVersion          : "${hiltVersion}",
     kotlinVersion        : "${kotlinVersion}",
-    lifecycleVersion     : '2.6.1',
+    lifecycleVersion     : '2.6.2',
     navVersion           : "${navVersion}",
 
     junitVersion         : '4.13.2',
@@ -38,11 +39,11 @@ subprojects {
     }
 
     android {
-      compileSdk 33
+      compileSdk 34
 
       defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
       }
 
       compileOptions {

diff --git a/gradle.properties b/gradle.properties
@@ -24,8 +24,8 @@ android.nonFinalResIds=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # gradle plugin dependencies
-agpVersion=8.1.0
-hiltVersion=2.47
-kotlinVersion=1.8.22
-navVersion=2.6.0
-aboutLibrariesVersion=10.8.3
+agpVersion=8.1.2
+hiltVersion=2.48
+kotlinVersion=1.9.10
+navVersion=2.7.3
+aboutLibrariesVersion=10.9.1
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=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum