Emulator-Archive/melonDS-android
1
0
Fork 0
mirror of https://github.com/rafaelvcaetano/melonDS-android.git synced 2024-11-26 23:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Rafael Caetano 2024-06-16 17:59:45 +01:00
parent b0df4ebd9f
commit aaf4e4304d
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/build
/captures
.externalNativeBuild
.kotlin

4
app/build.gradle.kts
View File

@ -2,6 +2,7 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.hilt.android)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.parcelize)
@ -56,9 +57,6 @@ android {
applicationIdSuffix = ".dev"
}
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
flavorDimensions.add("version")
flavorDimensions.add("build")

6
app/src/main/java/me/magnum/melonds/ui/emulator/EmulatorActivity.kt
View File

@ -409,7 +409,7 @@ class EmulatorActivity : AppCompatActivity() {
lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.currentFps.collectLatest {
if (it == null) {
binding.textFps.text = ""
binding.textFps.text = null
} else {
binding.textFps.text = getString(R.string.info_fps, it)
}
@ -517,7 +517,7 @@ class EmulatorActivity : AppCompatActivity() {
}
}
override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
if (viewModel.emulatorState.value.isRunning()) {
@ -569,7 +569,7 @@ class EmulatorActivity : AppCompatActivity() {
throw RuntimeException("No console type specified")
}
val firmwareConsoleType = ConsoleType.values()[consoleTypeParameter]
val firmwareConsoleType = ConsoleType.entries[consoleTypeParameter]
viewModel.loadFirmware(firmwareConsoleType)
} else {
val romParcelable = extras?.parcelable(KEY_ROM) as RomParcelable?

1
build.gradle.kts
View File

@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.hilt.android) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.jvm) apply false

30
gradle/libs.versions.toml
View File

@ -1,28 +1,27 @@
[versions]
accompanist = "0.30.1"
activity = "1.8.2"
appCompat = "1.6.1"
cameraX = "1.3.1"
activity = "1.9.0"
appCompat = "1.7.0"
cameraX = "1.3.4"
cardView = "1.0.0"
coil = "2.2.2"
commonsCompress = "1.21"
composeBom = "2023.10.01"
composeCompiler = "1.5.7"
composeBom = "2024.06.00"
constraintLayout = "2.1.4"
core = "1.12.0"
core = "1.13.1"
documentFile = "1.0.1"
flexbox = "3.0.0"
fragment = "1.6.2"
fragment = "1.8.0"
gradle = "8.5.0"
gson = "2.8.6"
hiltX = "1.1.0"
hilt = "2.48"
gson = "2.10.1"
hiltX = "1.2.0"
hilt = "2.49"
junit = "4.12"
kotlin = "1.9.21"
kotlin = "2.0.0"
kotlinxCoroutines = "1.7.3"
ksp = "1.9.0-1.0.12"
lifecycleViewModel = "2.6.2"
material = "1.7.0"
ksp = "2.0.0-1.0.22"
lifecycleViewModel = "2.8.2"
material = "1.12.0"
okHttp = "4.11.0"
picasso = "2.71828"
preference = "1.2.1"
@ -30,7 +29,7 @@ recyclerView = "1.3.2"
room = "2.6.1"
rxAndroid = "2.1.1"
rxJava = "2.2.10"
splashscreen = "1.0.0"
splashscreen = "1.0.1"
swipeRefreshLayout = "1.1.0"
work = "2.9.0"
markwon = "4.6.2"
@ -107,6 +106,7 @@ junit = { module = "junit:junit", version.ref = "junit" }
[plugins]
android-application = { id = "com.android.application", version.ref = "gradle" }
android-library = { id = "com.android.library", version.ref = "gradle" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

2
masterswitch/build.gradle.kts
View File

@ -1,6 +1,6 @@
plugins {
alias(libs.plugins.android.library)
id("kotlin-android")
alias(libs.plugins.kotlin.android)
}
android {