Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
336e24b8
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,发现更多精彩内容 >>
提交
336e24b8
编写于
8月 19, 2017
作者:
I
Ilya Chernikov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix project structure after rebase on master
上级
d0b87675
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
38 addition
and
18 deletion
+38
-18
build-common/build.gradle.kts
build-common/build.gradle.kts
+1
-0
build.gradle.kts
build.gradle.kts
+2
-1
compiler/incremental-compilation-impl/build.gradle.kts
compiler/incremental-compilation-impl/build.gradle.kts
+4
-0
idea/build.gradle.kts
idea/build.gradle.kts
+1
-2
idea/idea-android/build.gradle.kts
idea/idea-android/build.gradle.kts
+1
-4
idea/idea-android/idea-android-output-parser/build.gradle.kts
.../idea-android/idea-android-output-parser/build.gradle.kts
+1
-1
idea/idea-core/build.gradle.kts
idea/idea-core/build.gradle.kts
+3
-1
j2k/build.gradle.kts
j2k/build.gradle.kts
+0
-1
jps-plugin/build.gradle.kts
jps-plugin/build.gradle.kts
+1
-0
libraries/commonConfiguration.gradle
libraries/commonConfiguration.gradle
+1
-0
plugins/lint/build.gradle.kts
plugins/lint/build.gradle.kts
+1
-2
plugins/uast-kotlin-idea/build.gradle.kts
plugins/uast-kotlin-idea/build.gradle.kts
+0
-1
plugins/uast-kotlin/build.gradle.kts
plugins/uast-kotlin/build.gradle.kts
+1
-1
prepare/compiler/build.gradle.kts
prepare/compiler/build.gradle.kts
+8
-3
prepare/kotlin-plugin/build.gradle.kts
prepare/kotlin-plugin/build.gradle.kts
+1
-1
prepare/mock-runtime-for-test/build.gradle.kts
prepare/mock-runtime-for-test/build.gradle.kts
+12
-0
未找到文件。
build-common/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -8,6 +8,7 @@ dependencies {
compile
(
project
(
":compiler:util"
))
compile
(
project
(
":compiler:cli-common"
))
compile
(
project
(
":compiler:frontend.java"
))
compile
(
project
(
":js:js.serializer"
))
compile
(
ideaSdkDeps
(
"util"
))
testCompile
(
commonDep
(
"junit:junit"
))
testCompile
(
project
(
":compiler.tests-common"
))
...
...
build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -99,7 +99,7 @@ extra["versions.javaslang"] = "2.0.6"
extra
[
"versions.ant"
]
=
"1.8.2"
extra
[
"ideaCoreSdkJars"
]
=
arrayOf
(
"annotations"
,
"asm-all"
,
"guava"
,
"intellij-core"
,
"jdom"
,
"jna"
,
"log4j"
,
"picocontainer"
,
"snappy-in-java"
,
"trove4j"
,
"xpp3-1.1.4-min"
,
"xstream"
)
"snappy-in-java"
,
"
streamex"
,
"
trove4j"
,
"xpp3-1.1.4-min"
,
"xstream"
)
extra
[
"compilerModules"
]
=
arrayOf
(
":compiler:util"
,
":compiler:container"
,
...
...
@@ -179,6 +179,7 @@ allprojects {
tasks
.
withType
<
KotlinCompile
>
{
kotlinOptions
.
freeCompilerArgs
=
listOf
(
"-Xallow-kotlin-package"
,
"-module-name"
,
project
.
name
)
kotlinOptions
.
jvmTarget
=
"1.8"
}
tasks
.
withType
<
Kotlin2JsCompile
>
{
...
...
compiler/incremental-compilation-impl/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -9,8 +9,12 @@ dependencies {
compile
(
project
(
":compiler:frontend.java"
))
compile
(
project
(
":compiler:cli"
))
compile
(
project
(
":kotlin-build-common"
))
testCompile
(
project
(
":kotlin-test:kotlin-test-junit"
))
testCompile
(
project
(
":kotlin-stdlib"
))
testCompile
(
projectTests
(
":kotlin-build-common"
))
}
configureKotlinProjectSourcesDefault
()
configureKotlinProjectTestsDefault
()
testsJar
()
idea/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -73,8 +73,6 @@ dependencies {
testRuntime
(
ideaPluginDeps
(
"*.jar"
,
plugin
=
"maven"
))
testRuntime
(
ideaPluginDeps
(
"*.jar"
,
plugin
=
"android"
))
testRuntime
(
preloadedDeps
(
"uast-common"
,
"uast-java"
))
// deps below are test runtime deps, but made test compile to split compilation and running to reduce mem req
testCompile
(
project
(
":android-extensions-compiler"
))
testCompile
(
project
(
":plugins:android-extensions-idea"
))
{
isTransitive
=
false
}
...
...
@@ -98,6 +96,7 @@ dependencies {
configureKotlinProjectSources
(
"src"
,
"idea-maven/src"
,
"idea-gradle/src"
,
"idea-completion/src"
,
"idea-live-templates/src"
,
"idea-repl/src"
)
...
...
idea/idea-android/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -17,8 +17,7 @@ dependencies {
compile
(
project
(
":idea:ide-common"
))
compile
(
ideaSdkDeps
(
"openapi"
,
"idea"
))
compile
(
ideaPluginDeps
(
"gradle-tooling-api"
,
plugin
=
"gradle"
))
compile
(
ideaPluginDeps
(
"android"
,
"common"
,
"sdklib"
,
"sdk-common"
,
"layoutlib-api"
,
plugin
=
"android"
))
compile
(
preloadedDeps
(
"uast-common"
,
"uast-java"
))
compile
(
ideaPluginDeps
(
"android"
,
"android-common"
,
"sdklib"
,
"sdk-common"
,
"layoutlib-api"
,
plugin
=
"android"
))
compile
(
preloadedDeps
(
"dx"
,
subdir
=
"android-5.0/lib"
))
testCompile
(
project
(
":kotlin-test:kotlin-test-jvm"
))
...
...
@@ -26,11 +25,9 @@ dependencies {
testCompile
(
project
(
":idea:idea-test-framework"
))
{
isTransitive
=
false
}
testCompile
(
project
(
":plugins:lint"
))
{
isTransitive
=
false
}
testCompile
(
projectTests
(
":idea"
))
testCompile
(
ideaPluginDeps
(
"android-common"
,
"sdklib"
,
plugin
=
"android"
))
testCompile
(
ideaPluginDeps
(
"properties"
,
plugin
=
"properties"
))
testCompile
(
ideaSdkDeps
(
"gson"
))
testRuntime
(
preloadedDeps
(
"uast-common"
,
"uast-java"
))
testRuntime
(
project
(
":plugins:android-extensions-idea"
))
testRuntime
(
project
(
":plugins:sam-with-receiver-ide"
))
testRuntime
(
project
(
":plugins:noarg-ide"
))
...
...
idea/idea-android/idea-android-output-parser/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -6,7 +6,7 @@ dependencies {
compile
(
project
(
":compiler:util"
))
compile
(
ideaSdkCoreDeps
(
"intellij-core"
))
compile
(
ideaPluginDeps
(
"gradle-tooling-api"
,
plugin
=
"gradle"
))
compile
(
ideaPluginDeps
(
"android"
,
"common"
,
"sdk-common"
,
plugin
=
"android"
))
compile
(
ideaPluginDeps
(
"android"
,
"
android-
common"
,
"sdk-common"
,
plugin
=
"android"
))
}
configureKotlinProjectSourcesDefault
()
...
...
idea/idea-core/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -16,7 +16,7 @@ dependencies {
compile
(
ideaSdkCoreDeps
(
"intellij-core"
,
"util"
))
compile
(
ideaSdkDeps
(
"openapi"
,
"idea"
))
compile
(
ideaPluginDeps
(
"gradle-tooling-api"
,
"gradle"
,
plugin
=
"gradle"
))
compile
(
preloadedDeps
(
"
uast-common"
,
"
kotlinx-coroutines-core"
,
"kotlinx-coroutines-jdk8"
))
compile
(
preloadedDeps
(
"kotlinx-coroutines-core"
,
"kotlinx-coroutines-jdk8"
))
buildVersion
()
}
...
...
@@ -25,3 +25,5 @@ configureKotlinProjectResources("idea-analysis/src", sourcesBaseDir = File(rootD
include
(
"**/*.properties"
)
}
configureKotlinProjectNoTests
()
j2k/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -42,7 +42,6 @@ dependencies {
// testRuntime(ideaPluginDeps("*.jar", plugin = "java-i18n"))
// testRuntime(ideaPluginDeps("*.jar", plugin = "coverage"))
// testRuntime(ideaPluginDeps("*.jar", plugin = "java-decompiler"))
// testRuntime(preloadedDeps("uast-common", "uast-java"))
buildVersion
()
}
...
...
jps-plugin/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -14,6 +14,7 @@ dependencies {
compile
(
ideaSdkDeps
(
"jps-builders"
,
"jps-builders-6"
,
subdir
=
"jps"
))
testCompile
(
project
(
":compiler.tests-common"
))
testCompile
(
project
(
":compiler:incremental-compilation-impl"
))
testCompile
(
projectTests
(
":compiler:incremental-compilation-impl"
))
testCompileOnly
(
ideaSdkDeps
(
"jps-build-test"
,
subdir
=
"jps/test"
))
testCompile
(
commonDep
(
"junit:junit"
))
testCompile
(
project
(
":kotlin-test:kotlin-test-jvm"
))
...
...
libraries/commonConfiguration.gradle
浏览文件 @
336e24b8
...
...
@@ -57,6 +57,7 @@ ext.configureJvm6Project = { Project project ->
tasks
.
withType
(
project
.
compileKotlin
.
class
)
{
kotlinOptions
.
jdkHome
=
JDK_16
kotlinOptions
.
jvmTarget
=
"1.6"
doFirst
{
System
.
setProperty
(
"kotlin.colors.enabled"
,
"false"
)
}
...
...
plugins/lint/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -11,8 +11,7 @@ dependencies {
compile
(
project
(
":idea:idea-core"
))
compile
(
project
(
":idea:idea-android"
))
compile
(
project
(
":plugins:uast-kotlin"
))
compile
(
preloadedDeps
(
"uast-common"
,
"uast-java"
))
compile
(
ideaPluginDeps
(
"android"
,
"android-common"
,
"common"
,
"sdk-common"
,
"sdklib"
,
"sdk-tools"
,
"repository"
,
"lombok-ast"
,
"kxml2"
,
plugin
=
"android"
))
compile
(
ideaPluginDeps
(
"android"
,
"android-common"
,
"sdk-common"
,
"sdklib"
,
"sdk-tools"
,
"repository"
,
"lombok-ast"
,
"kxml2"
,
plugin
=
"android"
))
compile
(
ideaSdkCoreDeps
(
"intellij-core"
,
"util"
))
compile
(
ideaSdkDeps
(
"guava"
))
}
...
...
plugins/uast-kotlin-idea/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -9,7 +9,6 @@ dependencies {
compile
(
project
(
":compiler:frontend.java"
))
compile
(
project
(
":idea:ide-common"
))
compile
(
project
(
":plugins:uast-kotlin"
))
compile
(
preloadedDeps
(
"uast-common"
,
"uast-java"
))
buildVersion
()
}
...
...
plugins/uast-kotlin/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -13,7 +13,7 @@ dependencies {
compile
(
project
(
":compiler:frontend"
))
compile
(
project
(
":compiler:frontend.java"
))
compile
(
project
(
":compiler:light-classes"
))
compile
(
preloadedDeps
(
"uast-common"
,
"uast-jav
a"
))
compile
Only
(
ideaSdkDeps
(
"openapi"
,
"ide
a"
))
buildVersion
()
testCompile
(
project
(
":kotlin-test:kotlin-test-jvm"
))
testCompile
(
project
(
":compiler.tests-common"
))
...
...
prepare/compiler/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -53,6 +53,9 @@ val packagesToRelocate =
"javax.inject"
,
"org.fusesource"
)
val
ideaCoreSdkJars
:
Array
<
String
>
by
rootProject
.
extra
val
coreSdkJarsSimple
=
ideaCoreSdkJars
.
filterNot
{
it
==
"jdom"
||
it
==
"log4j"
}.
toTypedArray
()
fun
firstFromJavaHomeThatExists
(
vararg
paths
:
String
):
File
=
paths
.
mapNotNull
{
File
(
javaHome
,
it
).
takeIf
{
it
.
exists
()
}
}.
firstOrNull
()
?:
throw
GradleException
(
"Cannot find under '$javaHome' neither of: ${paths.joinToString()}"
)
...
...
@@ -73,9 +76,8 @@ dependencies {
// buildVersion()
fatJarContents
(
project
(
":core:builtins"
,
configuration
=
"builtins"
))
fatJarContents
(
ideaSdkCoreDeps
(*(
rootProject
.
extra
[
"ideaCoreSdkJars"
]
as
Array
<
String
>)))
fatJarContents
(
ideaSdkDeps
(
"jna-platform"
,
"oromatcher"
))
fatJarContents
(
ideaSdkDeps
(
"jps-model.jar"
,
subdir
=
"jps"
))
fatJarContents
(
ideaSdkCoreDeps
(*
coreSdkJarsSimple
))
fatJarContents
(
ideaSdkDeps
(
"jna-platform"
))
fatJarContents
(
commonDep
(
"javax.inject"
))
fatJarContents
(
commonDep
(
"org.jline"
,
"jline"
))
fatJarContents
(
protobufFull
())
...
...
@@ -106,6 +108,9 @@ val packCompiler by task<ShadowJar> {
setupPublicJar
(
"before-proguard"
,
""
)
from
(
fatJarContents
)
ideaSdkDeps
(
"jps-model.jar"
,
subdir
=
"jps"
).
forEach
{
from
(
it
)
{
exclude
(
"META-INF/services/**"
)
}
}
ideaSdkDeps
(
"oromatcher"
).
forEach
{
from
(
it
)
{
exclude
(
"META-INF/jb/** META-INF/LICENSE"
)
}
}
ideaSdkCoreDeps
(
"jdom"
,
"log4j"
).
forEach
{
from
(
it
)
{
exclude
(
"META-INF/jb/** META-INF/LICENSE"
)
}
}
manifest
.
attributes
.
put
(
"Class-Path"
,
compilerManifestClassPath
)
manifest
.
attributes
.
put
(
"Main-Class"
,
"org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"
)
...
...
prepare/kotlin-plugin/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -57,7 +57,7 @@ dependencies {
sideJars
(
project
(
":kotlin-script-runtime"
))
sideJars
(
commonDep
(
"io.javaslang"
,
"javaslang"
))
sideJars
(
commonDep
(
"javax.inject"
))
sideJars
(
preloadedDeps
(
"markdown"
,
"kotlinx-coroutines-core"
,
"kotlinx-coroutines-jdk8"
,
"uast-java"
))
sideJars
(
preloadedDeps
(
"markdown"
,
"kotlinx-coroutines-core"
,
"kotlinx-coroutines-jdk8"
))
}
val
targetJar
=
File
(
buildDir
,
"libs"
,
"kotlin-plugin.jar"
)
...
...
prepare/mock-runtime-for-test/build.gradle.kts
浏览文件 @
336e24b8
...
...
@@ -2,6 +2,7 @@
import
org.gradle.jvm.tasks.Jar
import
org.gradle.api.internal.HasConvention
import
org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import
org.jetbrains.kotlin.gradle.tasks.KotlinCompile
apply
{
plugin
(
"kotlin"
)
}
...
...
@@ -34,6 +35,17 @@ configure<JavaPluginConvention> {
configureKotlinProjectNoTests
()
tasks
.
withType
<
JavaCompile
>
{
sourceCompatibility
=
"1.6"
targetCompatibility
=
"1.6"
// options.fork = true
options
.
forkOptions
.
javaHome
=
file
(
rootProject
.
extra
[
"JDK_16"
]
as
String
)
}
tasks
.
withType
<
KotlinCompile
>
{
kotlinOptions
.
jvmTarget
=
"1.6"
kotlinOptions
.
jdkHome
=
rootProject
.
extra
[
"JDK_16"
]
as
String
}
task
<
Copy
>(
"dist"
)
{
into
(
rootProject
.
extra
[
"distDir"
].
toString
())
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录