Skip to content

Commit

Permalink
Updated kotlin version based on whitesource recommendation (#448)
Browse files Browse the repository at this point in the history
Signed-off-by: Sai Kumar <[email protected]>
  • Loading branch information
saikaranam-amazon authored Jul 11, 2022
1 parent 31833db commit 0c01571
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ buildscript {
plugin_previous_version = opensearch_previous_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2')

common_utils_version = System.getProperty("common_utils.version", opensearch_build)
kotlin_version = System.getProperty("kotlin.version", "1.3.72")
kotlin_version = System.getProperty("kotlin.version", "1.6.0")

}

Expand All @@ -59,7 +59,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0-RC15"
classpath "org.jacoco:org.jacoco.agent:0.8.5"
classpath "org.jacoco:org.jacoco.agent:0.8.7"
}
}

Expand All @@ -75,6 +75,9 @@ allprojects {
if (isSnapshot) {
version += "-SNAPSHOT"
}
// Have resolve the jacoco version here to work with kotlin
// Ref: https://github.com/jacoco/jacoco/issues/1187
jacoco.toolVersion = "0.8.7"
}

apply plugin: 'java'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import org.opensearch.replication.util.suspending
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.ObsoleteCoroutinesApi
import kotlinx.coroutines.cancel
import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive
Expand Down Expand Up @@ -178,6 +179,7 @@ abstract class CrossClusterReplicationTask(id: Long, type: String, action: Strin
client.suspending(::updatePersistentTaskState)(state)
}

@ObsoleteCoroutinesApi
protected abstract suspend fun execute(scope: CoroutineScope, initialState: PersistentTaskState?)

protected open suspend fun cleanup() {}
Expand Down

0 comments on commit 0c01571

Please sign in to comment.