Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
b463a0fa
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
b463a0fa
编写于
2月 15, 2021
作者:
A
Alexander Likhachev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Gradle] Use property provider for configuration time only if available
上级
683bd0ed
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
3 deletion
+18
-3
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
...ins/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+6
-1
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
...ins/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
+6
-1
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTest.kt
...ns/kotlin/gradle/targets/native/tasks/KotlinNativeTest.kt
+6
-1
未找到文件。
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
浏览文件 @
b463a0fa
...
...
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.gradle.targets.js.testing.*
import
org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
import
org.jetbrains.kotlin.gradle.tasks.KotlinTest
import
org.jetbrains.kotlin.gradle.testing.internal.reportsDir
import
org.jetbrains.kotlin.gradle.utils.isConfigurationCacheAvailable
import
org.jetbrains.kotlin.gradle.utils.property
import
org.slf4j.Logger
import
java.io.File
...
...
@@ -60,7 +61,11 @@ class KotlinKarma(
defaultConfigDirectory
}
private
val
isTeamCity
by
lazy
{
project
.
providers
.
gradleProperty
(
TC_PROJECT_PROPERTY
).
forUseAtConfigurationTime
().
isPresent
if
(
isConfigurationCacheAvailable
(
project
.
gradle
))
{
project
.
providers
.
gradleProperty
(
TC_PROJECT_PROPERTY
).
forUseAtConfigurationTime
().
isPresent
}
else
{
project
.
hasProperty
(
TC_PROJECT_PROPERTY
)
}
}
override
val
requiredNpmDependencies
:
Set
<
RequiredKotlinJsDependency
>
...
...
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
浏览文件 @
b463a0fa
...
...
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
import
org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
import
org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTestFramework
import
org.jetbrains.kotlin.gradle.targets.js.testing.KotlinTestRunnerCliArgs
import
org.jetbrains.kotlin.gradle.utils.isConfigurationCacheAvailable
import
java.io.File
class
KotlinMocha
(
@Transient
override
val
compilation
:
KotlinJsCompilation
,
private
val
basePath
:
String
)
:
...
...
@@ -29,7 +30,11 @@ class KotlinMocha(@Transient override val compilation: KotlinJsCompilation, priv
private
val
nodeJs
=
NodeJsRootPlugin
.
apply
(
project
.
rootProject
)
private
val
versions
=
nodeJs
.
versions
private
val
isTeamCity
by
lazy
{
project
.
providers
.
gradleProperty
(
TC_PROJECT_PROPERTY
).
forUseAtConfigurationTime
().
isPresent
if
(
isConfigurationCacheAvailable
(
project
.
gradle
))
{
project
.
providers
.
gradleProperty
(
TC_PROJECT_PROPERTY
).
forUseAtConfigurationTime
().
isPresent
}
else
{
project
.
hasProperty
(
TC_PROJECT_PROPERTY
)
}
}
override
val
settingsState
:
String
...
...
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTest.kt
浏览文件 @
b463a0fa
...
...
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuto
import
org.jetbrains.kotlin.gradle.plugin.mpp.isAtLeast
import
org.jetbrains.kotlin.gradle.targets.native.internal.parseKotlinNativeStackTraceAsJvm
import
org.jetbrains.kotlin.gradle.tasks.KotlinTest
import
org.jetbrains.kotlin.gradle.utils.isConfigurationCacheAvailable
import
org.jetbrains.kotlin.konan.CompilerVersion
import
java.io.File
import
java.util.concurrent.Callable
...
...
@@ -114,7 +115,11 @@ abstract class KotlinNativeTest : KotlinTest() {
prependSuiteName
=
targetName
!=
null
,
treatFailedTestOutputAsStacktrace
=
false
,
stackTraceParser
=
::
parseKotlinNativeStackTraceAsJvm
,
escapeTCMessagesInLog
=
project
.
providers
.
gradleProperty
(
TC_PROJECT_PROPERTY
).
forUseAtConfigurationTime
().
isPresent
escapeTCMessagesInLog
=
if
(
isConfigurationCacheAvailable
(
project
.
gradle
))
{
project
.
providers
.
gradleProperty
(
TC_PROJECT_PROPERTY
).
forUseAtConfigurationTime
().
isPresent
}
else
{
project
.
hasProperty
(
TC_PROJECT_PROPERTY
)
}
)
// The KotlinTest expects that the exit code is zero even if some tests failed.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录