nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade dependencies

Browse source 
buildTools 31.0.0 -> 32.0.0
material 1.4.0 -> 1.5.0
navigation 2.3.5 -> 2.4.0
room 2.4.0 -> 2.4.1
This commit is contained in:
Jarne Demeulemeester 2022-01-30 18:46:45 +01:00
parent 717e530b3c
commit fa236d369d
No known key found for this signature in database
GPG key ID: 65C6006F2032DD14
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/build.gradle.kts
View file

@ -10,7 +10,7 @@ plugins {
android { android {
compileSdk = 31 compileSdk = 31
buildToolsVersion = "31.0.0" buildToolsVersion = "32.0.0"
defaultConfig { defaultConfig {
applicationId = "dev.jdtech.jellyfin" applicationId = "dev.jdtech.jellyfin"
@ -72,7 +72,7 @@ dependencies {
// Material // Material
implementation("com.google.android.material:material:1.4.0") implementation("com.google.android.material:material:1.5.0")
// ConstraintLayout // ConstraintLayout
implementation("androidx.constraintlayout:constraintlayout:2.1.3") implementation("androidx.constraintlayout:constraintlayout:2.1.3")
@ -83,7 +83,7 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
// Navigation // Navigation
val navigationVersion = "2.3.5" val navigationVersion = "2.4.0"
implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion") implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion")
implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion") implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion")
@ -92,13 +92,13 @@ dependencies {
implementation("androidx.recyclerview:recyclerview-selection:1.1.0") implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
// Room // Room
val roomVersion = "2.4.0" val roomVersion = "2.4.1"
implementation("androidx.room:room-runtime:$roomVersion") implementation("androidx.room:room-runtime:$roomVersion")
kapt("androidx.room:room-compiler:$roomVersion") kapt("androidx.room:room-compiler:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion")
// Preference // Preference
val preferenceVersion = "1.1.1" val preferenceVersion = "1.2.0"
implementation("androidx.preference:preference-ktx:$preferenceVersion") implementation("androidx.preference:preference-ktx:$preferenceVersion")
// Jellyfin // Jellyfin

4
app/src/main/java/dev/jdtech/jellyfin/MainActivity.kt
View file

@ -60,12 +60,12 @@ class MainActivity : AppCompatActivity() {
loadDownloadLocation(applicationContext) loadDownloadLocation(applicationContext)
viewModel.navigateToAddServer.observe(this, { viewModel.navigateToAddServer.observe(this) {
if (it) { if (it) {
navController.navigate(HomeFragmentDirections.actionHomeFragmentToAddServerFragment()) navController.navigate(HomeFragmentDirections.actionHomeFragmentToAddServerFragment())
viewModel.doneNavigateToAddServer() viewModel.doneNavigateToAddServer()
} }
}) }
} }
override fun onSupportNavigateUp(): Boolean { override fun onSupportNavigateUp(): Boolean {

2
app/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt
View file

@ -46,7 +46,7 @@ class HomeFragment : Fragment() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setHasOptionsMenu(true) setHasOptionsMenu(true)
findNavController().graph.startDestination = R.id.homeFragment findNavController().graph.setStartDestination(R.id.homeFragment)
} }
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {

2
app/src/main/res/navigation/app_navigation.xml
View file

@ -91,6 +91,7 @@
app:popExitAnim="@anim/nav_default_pop_exit_anim" /> app:popExitAnim="@anim/nav_default_pop_exit_anim" />
<argument <argument
android:name="libraryType" android:name="libraryType"
android:defaultValue="unknown"
app:argType="string" app:argType="string"
app:nullable="true" /> app:nullable="true" />
</fragment> </fragment>
@ -109,6 +110,7 @@
app:nullable="true" /> app:nullable="true" />
<argument <argument
android:name="itemType" android:name="itemType"
android:defaultValue="unknown"
app:argType="string" /> app:argType="string" />
<argument <argument
android:name="playerItem" android:name="playerItem"

3
build.gradle.kts
View file

@ -15,7 +15,8 @@ buildscript {
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle.kts files // in the individual module build.gradle.kts files
val navVersion = "2.3.5" val navVersion = "2.5.0-alpha01"
// NOTE: 2.5.0-alpha01 is used because 2.4.0 is incompatible with AGP 7.1
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
val hiltVersion = "2.40.5" val hiltVersion = "2.40.5"