Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
284d42fd
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,发现更多精彩内容 >>
提交
284d42fd
编写于
1月 18, 2021
作者:
S
Sergey Bogolepov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use camelCase for cacheKind control property
Because it is more intuitive for end-users.
上级
29f95c7d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
6 deletion
+8
-6
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt
...rg/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt
+4
-3
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties
...ative-cocoapods-multiple/kotlin-library/gradle.properties
+1
-1
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties
...ative-cocoapods-multiple/second-library/gradle.properties
+1
-1
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
...in/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+2
-1
未找到文件。
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt
浏览文件 @
284d42fd
...
...
@@ -143,8 +143,9 @@ class NativePlatformLibsIT : BaseGradleIT() {
deleteInstalledCompilers
()
fun
buildPlatformLibrariesWithoutAndWithCaches
(
target
:
KonanTarget
)
{
with
(
platformLibrariesProject
(
target
.
presetName
))
{
val
targetName
=
target
.
name
val
presetName
=
target
.
presetName
val
targetName
=
target
.
name
with
(
platformLibrariesProject
(
presetName
))
{
// Build libraries without caches.
buildWithLightDist
(
"tasks"
)
{
assertSuccessful
()
...
...
@@ -152,7 +153,7 @@ class NativePlatformLibsIT : BaseGradleIT() {
}
// Change cache kind and check that platform libraries generator was executed.
buildWithLightDist
(
"tasks"
,
"-Pkotlin.native.cacheKind.$
targ
etName=static"
)
{
buildWithLightDist
(
"tasks"
,
"-Pkotlin.native.cacheKind.$
pres
etName=static"
)
{
assertSuccessful
()
assertContains
(
"Precompile platform libraries for $targetName (precompilation: static)"
)
}
...
...
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/kotlin-library/gradle.properties
浏览文件 @
284d42fd
kotlin.native.cacheKind.ios_x64
=
none
\ No newline at end of file
kotlin.native.cacheKind.iosX64
=
none
\ No newline at end of file
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-multiple/second-library/gradle.properties
浏览文件 @
284d42fd
kotlin.native.cacheKind.ios_x64
=
none
\ No newline at end of file
kotlin.native.cacheKind.iosX64
=
none
\ No newline at end of file
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
浏览文件 @
284d42fd
...
...
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
import
org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import
org.jetbrains.kotlin.gradle.utils.SingleWarningPerBuild
import
org.jetbrains.kotlin.konan.target.KonanTarget
import
org.jetbrains.kotlin.konan.target.presetName
import
org.jetbrains.kotlin.statistics.metrics.StringMetrics
import
java.io.File
import
java.util.*
...
...
@@ -205,7 +206,7 @@ internal class PropertiesProvider private constructor(private val project: Proje
* Dependencies caching strategy for [target].
*/
fun
nativeCacheKindForTarget
(
target
:
KonanTarget
):
NativeCacheKind
?
=
property
(
"kotlin.native.cacheKind.${target.
n
ame}"
)
?.
let
{
NativeCacheKind
.
byCompilerArgument
(
it
)
}
property
(
"kotlin.native.cacheKind.${target.
presetN
ame}"
)
?.
let
{
NativeCacheKind
.
byCompilerArgument
(
it
)
}
/**
* Ignore overflow in [org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandler]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录