android: updated to latest dependencies again and fixed more deprecations

This commit is contained in:
Jarrod Norwell 2024-03-07 03:14:28 +08:00
parent 991f9cffc8
commit db691c0ceb
3 changed files with 17 additions and 17 deletions

View File

@ -2,9 +2,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import android.annotation.SuppressLint import android.annotation.SuppressLint
import kotlin.collections.setOf
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
import com.github.triplet.gradle.androidpublisher.ReleaseStatus import com.github.triplet.gradle.androidpublisher.ReleaseStatus
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
plugins { plugins {
id("com.android.application") id("com.android.application")
@ -26,9 +25,9 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
android { android {
namespace = "org.yuzu.yuzu_emu" namespace = "org.yuzu.yuzu_emu"
compileSdk = 34
compileSdkVersion = "android-34" ndkVersion = "26.2.11394342"
ndkVersion = "26.1.10909125"
buildFeatures { buildFeatures {
viewBinding = true viewBinding = true
@ -163,6 +162,7 @@ android {
path = file("../../../CMakeLists.txt") path = file("../../../CMakeLists.txt")
} }
} }
buildToolsVersion = "34.0.0"
defaultConfig { defaultConfig {
externalNativeBuild { externalNativeBuild {
@ -186,7 +186,7 @@ android {
} }
tasks.create<Delete>("ktlintReset") { tasks.create<Delete>("ktlintReset") {
delete(File(buildDir.path + File.separator + "intermediates/ktLint")) delete(File(layout.buildDirectory.asFile.toString() + File.separator + "intermediates/ktLint"))
} }
val showFormatHelp = { val showFormatHelp = {
@ -203,13 +203,13 @@ ktlint {
version.set("0.47.1") version.set("0.47.1")
android.set(true) android.set(true)
ignoreFailures.set(false) ignoreFailures.set(false)
disabledRules.set( //disabledRules.set(
setOf( // setOf(
"no-wildcard-imports", // "no-wildcard-imports",
"package-name", // "package-name",
"import-ordering" // "import-ordering"
) // )
) //)
reporters { reporters {
reporter(ReporterType.CHECKSTYLE) reporter(ReporterType.CHECKSTYLE)
} }
@ -234,7 +234,7 @@ dependencies {
implementation("com.google.android.material:material:1.11.0") implementation("com.google.android.material:material:1.11.0")
implementation("androidx.preference:preference-ktx:1.2.1") implementation("androidx.preference:preference-ktx:1.2.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
implementation("io.coil-kt:coil:2.2.2") implementation("io.coil-kt:coil:2.6.0")
implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.window:window:1.2.0") implementation("androidx.window:window:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.constraintlayout:constraintlayout:2.1.4")
@ -242,7 +242,7 @@ dependencies {
implementation("androidx.navigation:navigation-fragment-ktx:2.7.7") implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
implementation("androidx.navigation:navigation-ui-ktx:2.7.7") implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
implementation("info.debatty:java-string-similarity:2.0.0") implementation("info.debatty:java-string-similarity:2.0.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
} }
fun runGitCommand(command: List<String>): String { fun runGitCommand(command: List<String>): String {

View File

@ -9,7 +9,7 @@ plugins {
} }
tasks.register("clean").configure { tasks.register("clean").configure {
delete(rootProject.buildDir) delete(rootProject.layout.buildDirectory.asFile.toString())
} }
buildscript { buildscript {

View File

@ -1,6 +1,6 @@
#Sun Feb 21 18:16:59 EST 2021 #Thu Mar 07 02:52:25 AWST 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip