Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
a61facf3
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,发现更多精彩内容 >>
提交
a61facf3
编写于
9月 11, 2017
作者:
I
Ilya Chernikov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean most of the shared source roots conflicts
上级
e26b421e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
84 addition
and
24 deletion
+84
-24
build.gradle.kts
build.gradle.kts
+2
-0
compiler/build.gradle.kts
compiler/build.gradle.kts
+32
-19
compiler/conditional-preprocessor/build.gradle.kts
compiler/conditional-preprocessor/build.gradle.kts
+20
-0
compiler/daemon/build.gradle.kts
compiler/daemon/build.gradle.kts
+20
-0
idea/build.gradle.kts
idea/build.gradle.kts
+5
-3
jps-plugin/build.gradle.kts
jps-plugin/build.gradle.kts
+2
-1
libraries/tools/kotlin-gradle-plugin/build.gradle
libraries/tools/kotlin-gradle-plugin/build.gradle
+1
-1
settings.gradle
settings.gradle
+2
-0
未找到文件。
build.gradle.kts
浏览文件 @
a61facf3
...
...
@@ -104,6 +104,7 @@ extra["ideaCoreSdkJars"] = arrayOf("annotations", "asm-all", "guava", "intellij-
extra
[
"compilerModules"
]
=
arrayOf
(
":compiler:util"
,
":compiler:container"
,
":compiler:conditional-preprocessor"
,
":compiler:resolution"
,
":compiler:serialization"
,
":compiler:frontend"
,
...
...
@@ -111,6 +112,7 @@ extra["compilerModules"] = arrayOf(":compiler:util",
":compiler:frontend.script"
,
":compiler:cli-common"
,
":compiler:daemon-common"
,
":compiler:daemon"
,
":compiler:ir.tree"
,
":compiler:ir.psi2ir"
,
":compiler:backend-common"
,
...
...
compiler/build.gradle.kts
浏览文件 @
a61facf3
import
java.io.File
import
org.gradle.api.tasks.bundling.Jar
apply
{
plugin
(
"kotlin"
)
}
...
...
@@ -9,14 +10,6 @@ val compilerModules: Array<String> by rootProject.extra
val
otherCompilerModules
=
compilerModules
.
filter
{
it
!=
path
}
dependencies
{
compileOnly
(
project
(
":compiler:cli"
))
compileOnly
(
project
(
":compiler:daemon-common"
))
compileOnly
(
project
(
":compiler:incremental-compilation-impl"
))
compileOnly
(
project
(
":kotlin-build-common"
))
compileOnly
(
ideaSdkCoreDeps
(*(
rootProject
.
extra
[
"ideaCoreSdkJars"
]
as
Array
<
String
>)))
compileOnly
(
commonDep
(
"org.fusesource.jansi"
,
"jansi"
))
compileOnly
(
commonDep
(
"org.jline"
,
"jline"
))
testCompile
(
commonDep
(
"junit:junit"
))
testCompile
(
project
(
":kotlin-test:kotlin-test-jvm"
))
testCompile
(
project
(
":kotlin-test:kotlin-test-junit"
))
...
...
@@ -40,23 +33,43 @@ dependencies {
}
sourceSets
{
"main"
{
java
.
srcDirs
(
"daemon/src"
,
"conditional-preprocessor/src"
)
resources
.
srcDir
(
"../idea/src"
).
apply
{
include
(
"META-INF/extensions/common.xml"
,
"META-INF/extensions/kotlin2jvm.xml"
,
"META-INF/extensions/kotlin2js.xml"
)
}
"main"
{}
"test"
{
projectDefault
()
java
.
srcDir
(
"tests-ir-jvm/tests"
)
}
}
val
jar
:
Jar
by
tasks
jar
.
apply
{
from
(
the
<
JavaPluginConvention
>().
sourceSets
.
getByName
(
"main"
).
output
)
from
(
"../idea/src"
).
apply
{
include
(
"META-INF/extensions/common.xml"
,
"META-INF/extensions/kotlin2jvm.xml"
,
"META-INF/extensions/kotlin2js.xml"
)
}
"test"
{
projectDefault
()
}
}
testsJar
{}
// TODO: it seems incomlete, find and add missing dependencies
val
testDistProjects
=
listOf
(
":prepare:mock-runtime-for-test"
,
":kotlin-compiler"
,
":kotlin-runtime"
,
":kotlin-script-runtime"
,
":kotlin-stdlib"
,
":kotlin-stdlib-jre7"
,
":kotlin-stdlib-jre8"
,
":kotlin-stdlib-js"
,
":kotlin-reflect"
,
":kotlin-test:kotlin-test-jvm"
,
":kotlin-test:kotlin-test-junit"
,
":kotlin-test:kotlin-test-js"
,
":kotlin-daemon-client"
)
projectTest
{
dependsOnTaskIfExistsRec
(
"dist"
,
project
=
rootProject
)
dependsOn
(
":prepare:mock-runtime-for-test:dist"
)
dependsOn
(*
testDistProjects
.
map
{
"$it:dist"
}.
toTypedArray
())
workingDir
=
rootDir
systemProperty
(
"kotlin.test.script.classpath"
,
the
<
JavaPluginConvention
>().
sourceSets
.
getByName
(
"test"
).
output
.
classesDirs
.
joinToString
(
File
.
pathSeparator
))
}
...
...
compiler/conditional-preprocessor/build.gradle.kts
0 → 100644
浏览文件 @
a61facf3
apply
{
plugin
(
"kotlin"
)
}
jvmTarget
=
"1.6"
dependencies
{
val
compile
by
configurations
compile
(
project
(
":compiler:cli"
))
compile
(
project
(
":compiler:daemon-common"
))
compile
(
project
(
":compiler:incremental-compilation-impl"
))
compile
(
project
(
":kotlin-build-common"
))
compile
(
ideaSdkCoreDeps
(*(
rootProject
.
extra
[
"ideaCoreSdkJars"
]
as
Array
<
String
>)))
compile
(
commonDep
(
"org.fusesource.jansi"
,
"jansi"
))
compile
(
commonDep
(
"org.jline"
,
"jline"
))
}
sourceSets
{
"main"
{
projectDefault
()
}
"test"
{}
}
compiler/daemon/build.gradle.kts
0 → 100644
浏览文件 @
a61facf3
apply
{
plugin
(
"kotlin"
)
}
jvmTarget
=
"1.6"
dependencies
{
val
compile
by
configurations
compile
(
project
(
":compiler:cli"
))
compile
(
project
(
":compiler:daemon-common"
))
compile
(
project
(
":compiler:incremental-compilation-impl"
))
compile
(
project
(
":kotlin-build-common"
))
compile
(
ideaSdkCoreDeps
(*(
rootProject
.
extra
[
"ideaCoreSdkJars"
]
as
Array
<
String
>)))
compile
(
commonDep
(
"org.fusesource.jansi"
,
"jansi"
))
compile
(
commonDep
(
"org.jline"
,
"jline"
))
}
sourceSets
{
"main"
{
projectDefault
()
}
"test"
{}
}
idea/build.gradle.kts
浏览文件 @
a61facf3
...
...
@@ -94,11 +94,13 @@ sourceSets {
"idea-completion/src"
,
"idea-live-templates/src"
,
"idea-repl/src"
)
resources
.
srcDir
(
"idea-maven/resources"
)
}
"test"
{
java
.
srcDirs
(
"tests"
,
"idea-maven/test"
,
"idea-completion/tests"
)
projectDefault
()
java
.
srcDirs
(
"idea-maven/test"
,
"idea-completion/tests"
,
"idea-live-templates/tests"
)
}
}
...
...
jps-plugin/build.gradle.kts
浏览文件 @
a61facf3
...
...
@@ -31,7 +31,8 @@ dependencies {
sourceSets
{
"main"
{
projectDefault
()
}
"test"
{
java
.
srcDirs
(
"jps-tests/test"
)
java
.
srcDirs
(
"jps-tests/test"
,
"kannotator-jps-plugin-test/test"
)
}
}
...
...
libraries/tools/kotlin-gradle-plugin/build.gradle
浏览文件 @
a61facf3
...
...
@@ -35,7 +35,7 @@ dependencies {
compile
project
(
':kotlin-build-common'
)
compile
project
(
':compiler:compiler-runner'
)
compile
project
(
":compiler:incremental-compilation-impl"
)
compile
project
(
":compiler"
)
compile
project
(
":compiler
:daemon
"
)
compile
project
(
':kotlin-annotation-processing'
)
compileOnly
'com.android.tools.build:gradle:2.0.0'
...
...
settings.gradle
浏览文件 @
a61facf3
...
...
@@ -15,10 +15,12 @@ include ":kotlin-build-common",
":compiler"
,
":compiler:util"
,
":compiler:daemon-common"
,
":compiler:daemon"
,
":kotlin-daemon-client"
,
":kotlin-preloader"
,
":kotlin-runner"
,
":compiler:container"
,
":compiler:conditional-preprocessor"
,
":compiler:resolution"
,
":compiler:serialization"
,
":compiler:frontend"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录