From 62c16fa73ed895a60c76f1da1ede82d08e2ec969 Mon Sep 17 00:00:00 2001 From: PixelyIon Date: Sun, 6 Mar 2022 21:32:52 +0530 Subject: [PATCH] Upgrade Gradle (7.4), AGP (7.1.2) and Kotlin Dependencies --- app/build.gradle | 18 ++++++++++-------- .../main/java/emu/skyline/SettingsActivity.kt | 2 +- .../preference/IntegerListPreference.kt | 2 +- .../skyline/preference/LicensePreference.kt | 2 +- .../emu/skyline/preference/ThemePreference.kt | 2 +- build.gradle | 6 +++--- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e14e072c..75a0d3ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,8 @@ plugins { } android { + namespace 'emu.skyline' + compileSdkVersion 31 buildToolsVersion '31.0.0' defaultConfig { @@ -58,7 +60,7 @@ android { } /* Linting */ - lintOptions { + lint { disable 'IconLocation' } @@ -72,8 +74,8 @@ android { } /* Android Assets */ - aaptOptions { - ignoreAssetsPattern "*.md" + androidResources { + ignoreAssetsPattern '*.md' } /* Vulkan Validation Layers */ @@ -89,15 +91,15 @@ android { dependencies { /* Google */ implementation "androidx.core:core-ktx:1.7.0" - implementation 'androidx.appcompat:appcompat:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' - implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.preference:preference-ktx:1.2.0' + implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" - implementation 'androidx.fragment:fragment-ktx:1.4.0' + implementation 'androidx.fragment:fragment-ktx:1.4.1' implementation "com.google.dagger:hilt-android:$hilt_version" kapt "com.google.dagger:hilt-android-compiler:$hilt_version" implementation 'com.google.android.flexbox:flexbox:3.0.0' diff --git a/app/src/main/java/emu/skyline/SettingsActivity.kt b/app/src/main/java/emu/skyline/SettingsActivity.kt index 060cdf8b..ca65956a 100644 --- a/app/src/main/java/emu/skyline/SettingsActivity.kt +++ b/app/src/main/java/emu/skyline/SettingsActivity.kt @@ -58,7 +58,7 @@ class SettingsActivity : AppCompatActivity() { setPreferencesFromResource(R.xml.preferences, rootKey) } - override fun onDisplayPreferenceDialog(preference : Preference?) { + override fun onDisplayPreferenceDialog(preference : Preference) { if (preference is IntegerListPreference) { // Check if dialog is already showing if (parentFragmentManager.findFragmentByTag(DIALOG_FRAGMENT_TAG) != null) diff --git a/app/src/main/java/emu/skyline/preference/IntegerListPreference.kt b/app/src/main/java/emu/skyline/preference/IntegerListPreference.kt index 0cc3686e..dd28223d 100644 --- a/app/src/main/java/emu/skyline/preference/IntegerListPreference.kt +++ b/app/src/main/java/emu/skyline/preference/IntegerListPreference.kt @@ -142,7 +142,7 @@ class IntegerListPreference @JvmOverloads constructor( getPersistedInt(0) } - override fun onSaveInstanceState() : Parcelable { + override fun onSaveInstanceState() : Parcelable? { val superState = super.onSaveInstanceState() if (isPersistent) // No need to save instance state since it's persistent diff --git a/app/src/main/java/emu/skyline/preference/LicensePreference.kt b/app/src/main/java/emu/skyline/preference/LicensePreference.kt index d642a948..96868326 100644 --- a/app/src/main/java/emu/skyline/preference/LicensePreference.kt +++ b/app/src/main/java/emu/skyline/preference/LicensePreference.kt @@ -16,7 +16,7 @@ import emu.skyline.R /** * This preference is used to show licenses and the source of a library */ -class LicensePreference @JvmOverloads constructor(context : Context?, attrs : AttributeSet? = null, defStyleAttr : Int = R.attr.dialogPreferenceStyle) : Preference(context, attrs, defStyleAttr) { +class LicensePreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = R.attr.dialogPreferenceStyle) : Preference(context, attrs, defStyleAttr) { /** * The [FragmentManager] is used to show the [LicenseDialog] fragment */ diff --git a/app/src/main/java/emu/skyline/preference/ThemePreference.kt b/app/src/main/java/emu/skyline/preference/ThemePreference.kt index 07485cb8..e56cb0ad 100644 --- a/app/src/main/java/emu/skyline/preference/ThemePreference.kt +++ b/app/src/main/java/emu/skyline/preference/ThemePreference.kt @@ -14,7 +14,7 @@ import androidx.preference.R /** * This preference is used to set the theme to Light/Dark mode */ -class ThemePreference @JvmOverloads constructor(context : Context?, attrs : AttributeSet? = null, defStyleAttr : Int = R.attr.dialogPreferenceStyle) : ListPreference(context, attrs, defStyleAttr) { +class ThemePreference @JvmOverloads constructor(context : Context, attrs : AttributeSet? = null, defStyleAttr : Int = R.attr.dialogPreferenceStyle) : ListPreference(context, attrs, defStyleAttr) { /** * This changes [AppCompatDelegate.sDefaultNightMode] based on what the user's selection is */ diff --git a/build.gradle b/build.gradle index f4031c1e..cd19e367 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ buildscript { ext { kotlin_version = '1.6.0' - lifecycle_version = '2.4.0' - hilt_version = '2.39.1' + lifecycle_version = '2.4.1' + hilt_version = '2.41' } repositories { @@ -12,7 +12,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0-rc01' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" diff --git a/gradle.properties b/gradle.properties index 533c6589..953228d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2g +org.gradle.jvmargs=-Xmx3g -XX:+UseParallelGC # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 798cab05..8c8235f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jan 10 14:58:11 GMT 2022 +#Sun Mar 06 15:49:50 GMT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME