Skip to content

Commit

Permalink
Bump Kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
@d4rken
d4rken committed Apr 10, 2023
1 parent 50674de commit a30eb1c
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 12 deletions.
2 changes: 2 additions & 0 deletions app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/AppJunkDetailsFragmentVM.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import eu.darken.sdmse.appcleaner.core.AppJunk
import eu.darken.sdmse.appcleaner.core.hasData
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerDeleteTask
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerScanTask
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerSchedulerTask
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerTask
import eu.darken.sdmse.common.SingleLiveEvent
import eu.darken.sdmse.common.coroutine.DispatcherProvider
Expand Down Expand Up @@ -60,6 +61,7 @@ class AppJunkDetailsFragmentVM @Inject constructor(
log(TAG) { "forwardTask(): Result $result" }
when (result) {
is AppCleanerScanTask.Success -> {}
is AppCleanerSchedulerTask.Success -> {}
is AppCleanerDeleteTask.Success -> events.postValue(AppJunkDetailsEvents.TaskResult(result))
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class AppControlListFragment : Fragment3(R.layout.appcontrol_list_fragment) {

vm.events.observe2(ui) {
when (it) {

is AppControlListEvents.ConfirmDeletion -> {}
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/actions/AppActionDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AppActionDialog : BottomSheetDialogFragment2() {

vm.events.observe2(ui) { event ->
when (event) {

else -> {}
}
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/CorpseDetailsFragmentVM.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ import eu.darken.sdmse.common.uix.ViewModel3
import eu.darken.sdmse.corpsefinder.core.Corpse
import eu.darken.sdmse.corpsefinder.core.CorpseFinder
import eu.darken.sdmse.corpsefinder.core.hasData
import eu.darken.sdmse.corpsefinder.core.tasks.CorpseFinderDeleteTask
import eu.darken.sdmse.corpsefinder.core.tasks.CorpseFinderScanTask
import eu.darken.sdmse.corpsefinder.core.tasks.CorpseFinderTask
import eu.darken.sdmse.corpsefinder.core.tasks.*
import eu.darken.sdmse.main.core.taskmanager.TaskManager
import kotlinx.coroutines.flow.*
import javax.inject.Inject
Expand Down Expand Up @@ -60,6 +58,8 @@ class CorpseDetailsFragmentVM @Inject constructor(
log(TAG) { "forwardTask(): Result $result" }
when (result) {
is CorpseFinderDeleteTask.Success -> events.postValue(CorpseDetailsEvents.TaskResult(result))
is UninstallWatcherTask.Success -> {}
is CorpseFinderSchedulerTask.Success -> {}
is CorpseFinderScanTask.Success -> {}
}
}
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragmentVM.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import eu.darken.sdmse.appcleaner.core.AppCleaner
import eu.darken.sdmse.appcleaner.core.hasData
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerDeleteTask
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerScanTask
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerSchedulerTask
import eu.darken.sdmse.appcleaner.core.tasks.AppCleanerTask
import eu.darken.sdmse.appcleaner.ui.AppCleanerDashCardVH
import eu.darken.sdmse.appcontrol.core.AppControl
Expand Down Expand Up @@ -35,9 +36,7 @@ import eu.darken.sdmse.common.upgrade.UpgradeRepo
import eu.darken.sdmse.common.upgrade.isPro
import eu.darken.sdmse.corpsefinder.core.CorpseFinder
import eu.darken.sdmse.corpsefinder.core.hasData
import eu.darken.sdmse.corpsefinder.core.tasks.CorpseFinderDeleteTask
import eu.darken.sdmse.corpsefinder.core.tasks.CorpseFinderScanTask
import eu.darken.sdmse.corpsefinder.core.tasks.CorpseFinderTask
import eu.darken.sdmse.corpsefinder.core.tasks.*
import eu.darken.sdmse.corpsefinder.ui.CorpseFinderDashCardVH
import eu.darken.sdmse.main.core.GeneralSettings
import eu.darken.sdmse.main.core.SDMTool
Expand All @@ -50,6 +49,7 @@ import eu.darken.sdmse.systemcleaner.core.SystemCleaner
import eu.darken.sdmse.systemcleaner.core.hasData
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerDeleteTask
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerScanTask
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerSchedulerTask
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerTask
import eu.darken.sdmse.systemcleaner.ui.SystemCleanerDashCardVH
import kotlinx.coroutines.flow.*
Expand Down Expand Up @@ -462,14 +462,18 @@ class DashboardFragmentVM @Inject constructor(
when (result) {
is CorpseFinderTask.Result -> when (result) {
is CorpseFinderScanTask.Success -> {}
is UninstallWatcherTask.Success -> {}
is CorpseFinderSchedulerTask.Success -> {}
is CorpseFinderDeleteTask.Success -> events.postValue(DashboardEvents.TaskResult(result))
}
is SystemCleanerTask.Result -> when (result) {
is SystemCleanerScanTask.Success -> {}
is SystemCleanerSchedulerTask.Success -> {}
is SystemCleanerDeleteTask.Success -> events.postValue(DashboardEvents.TaskResult(result))
}
is AppCleanerTask.Result -> when (result) {
is AppCleanerScanTask.Success -> {}
is AppCleanerSchedulerTask.Success -> {}
is AppCleanerDeleteTask.Success -> events.postValue(DashboardEvents.TaskResult(result))
}
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/FilterContentDetailsFragmentVM.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import eu.darken.sdmse.systemcleaner.core.filter.FilterIdentifier
import eu.darken.sdmse.systemcleaner.core.hasData
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerDeleteTask
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerScanTask
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerSchedulerTask
import eu.darken.sdmse.systemcleaner.core.tasks.SystemCleanerTask
import kotlinx.coroutines.flow.*
import javax.inject.Inject
Expand Down Expand Up @@ -65,6 +66,7 @@ class FilterContentDetailsFragmentVM @Inject constructor(
when (result) {
is SystemCleanerDeleteTask.Success -> events.postValue(FilterContentDetailsEvents.TaskResult(result))
is SystemCleanerScanTask.Success -> {}
is SystemCleanerSchedulerTask.Success -> {}
}
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ repositories {
}
dependencies {
implementation("com.android.tools.build:gradle:7.3.1")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
implementation("com.squareup:javapoet:1.13.0")
}
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/Versions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ object Versions {
}

object Kotlin {
const val core = "1.6.10"
const val coroutines = "1.6.0"
const val core = "1.8.20"
const val coroutines = "1.6.4"
}

object Dagger {
const val core = "2.44.2"
}

object Moshi {
const val core = "1.13.0"
const val core = "1.14.0"
}

object AndroidX {
Expand Down

0 comments on commit a30eb1c

Please sign in to comment.