isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Gradle 7.0 and Kotlin 1.5.0

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-05-23 18:33:34 -05:00
parent db91dce57f
commit 31c09b9c0b
8 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uhabits-core/build.gradle.kts
View File

@@ -67,3 +67,10 @@ kotlin {
}
}
}
tasks.named<org.gradle.language.jvm.tasks.ProcessResources>("jvmProcessResources") {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
tasks.named<org.gradle.language.jvm.tasks.ProcessResources>("jvmTestProcessResources") {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}

2
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/tasks/SingleThreadTaskRunner.kt
View File

@@ -31,7 +31,7 @@ class SingleThreadTaskRunner : TaskRunner {
override fun execute(task: Task) {
for (l in listeners) l.onTaskStarted(task)
if (!task.isCanceled) {
if (!task.isCanceled()) {
task.onAttached(this)
task.onPreExecute()
task.doInBackground()

4
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/tasks/Task.kt
View File

@@ -20,9 +20,7 @@ package org.isoron.uhabits.core.tasks
fun interface Task {
fun cancel() {}
val isCanceled: Boolean
get() = false
fun isCanceled() = false
fun doInBackground()
fun onAttached(runner: TaskRunner) {}
fun onPostExecute() {}