0.11.5-kotlin-1.7.0 #44

Merged
altavir merged 9 commits from dev into master 2022-06-09 19:44:46 +03:00
2 changed files with 6 additions and 5 deletions
Showing only changes of commit 6526a486f9 - Show all commits

View File

@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Kotlin 1.6.20 - Kotlin 1.6.20
- Context receivers enabled - Context receivers enabled
- Ktor 2.0 - Ktor 2.0
- ExplicitAPI does not override existing value
### Deprecated ### Deprecated

View File

@ -18,8 +18,8 @@ import ru.mipt.npm.gradle.internal.fromJsDependencies
private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xcontext-receivers") private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xcontext-receivers")
public fun Project.configureKScience( public fun Project.configureKScience(
kotlinVersion: KotlinVersion kotlinVersion: KotlinVersion,
){ ) {
//Common configuration //Common configuration
registerKScienceExtension() registerKScienceExtension()
repositories.applyRepos() repositories.applyRepos()
@ -40,7 +40,7 @@ public fun Project.configureKScience(
} }
} }
explicitApiWarning() if (explicitApi != null) explicitApiWarning()
} }
tasks.withType<KotlinJvmCompile> { tasks.withType<KotlinJvmCompile> {
kotlinOptions { kotlinOptions {
@ -86,7 +86,7 @@ public fun Project.configureKScience(
} }
} }
explicitApiWarning() if (explicitApi != null) explicitApiWarning()
} }
(tasks.findByName("processResources") as? Copy)?.apply { (tasks.findByName("processResources") as? Copy)?.apply {
@ -158,7 +158,7 @@ public fun Project.configureKScience(
useJUnitPlatform() useJUnitPlatform()
} }
explicitApiWarning() if (explicitApi != null) explicitApiWarning()
} }
} }