From 25c0c8b32dadd883108068736500e65ac6ed88ca Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Sun, 13 Feb 2022 00:41:35 +0530 Subject: [PATCH] Bump SDK to 32 + update gradle --- app/build.gradle | 12 ++++++------ app/src/main/java/com/aurora/store/MainActivity.kt | 6 +++--- .../store/view/ui/preferences/SettingsActivity.kt | 2 +- build.gradle | 7 ++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 347f3fe11..cf317e5a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,12 +23,12 @@ apply plugin: 'kotlin-kapt' apply plugin: "androidx.navigation.safeargs.kotlin" android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId "com.aurora.store" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 39 versionName "4.1.0" @@ -81,8 +81,8 @@ buildscript { fetch2 : "3.1.6", fuel : "2.3.0", glide : "4.11.0", - lifecycle : '2.4.0', - navigation: '2.3.5', + lifecycle : '2.4.1', + navigation: '2.4.1', epoxy : "4.3.1", libsu : "3.0.2" ] @@ -107,7 +107,7 @@ dependencies { implementation("org.apache.commons:commons-text:1.8") //Google's Goodies - implementation("com.google.android.material:material:1.4.0") + implementation("com.google.android.material:material:1.5.0") implementation("com.google.android:flexbox:2.0.1") implementation("com.google.code.gson:gson:2.8.6") @@ -115,7 +115,7 @@ dependencies { implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.viewpager2:viewpager2:1.0.0") implementation("androidx.vectordrawable:vectordrawable:1.1.0") - implementation("androidx.preference:preference-ktx:1.1.1") + implementation("androidx.preference:preference-ktx:1.2.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") //Arch LifeCycle diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt index 972e4844b..61e62e08f 100644 --- a/app/src/main/java/com/aurora/store/MainActivity.kt +++ b/app/src/main/java/com/aurora/store/MainActivity.kt @@ -178,9 +178,9 @@ class MainActivity : BaseActivity() { val graph = navController.graph when (defaultTab) { - 0 -> graph.startDestination = R.id.navigation_apps - 1 -> graph.startDestination = R.id.navigation_games - 2 -> graph.startDestination = R.id.navigation_updates + 0 -> graph.setStartDestination(R.id.navigation_apps) + 1 -> graph.setStartDestination(R.id.navigation_games) + 2 -> graph.setStartDestination(R.id.navigation_updates) } navController.graph = graph diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt index bbceea140..10ac7cebd 100644 --- a/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt @@ -118,7 +118,7 @@ class SettingsActivity : BaseActivity(), val fragment = fragmentFactory.instantiate( classLoader, - preference.fragment + preference.fragment.toString() ).apply { arguments = args setTargetFragment(caller, 0) diff --git a/build.gradle b/build.gradle index c4fc97778..0e98081f1 100644 --- a/build.gradle +++ b/build.gradle @@ -28,11 +28,12 @@ buildscript { kotlin_version = '1.4.30' } - ext.kotlin = "1.4.31" - ext.navigation= "2.3.4" + ext.kotlin = "1.5.30" + ext.navigation= "2.4.1" + ext.gradle = '7.1.0' dependencies { - classpath ('com.android.tools.build:gradle:7.0.3') + classpath ("com.android.tools.build:gradle:$gradle") classpath ("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin") classpath ("androidx.navigation:navigation-safe-args-gradle-plugin:$navigation") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a6e275633..26a656dae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -22,4 +22,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip