Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
fc3dda47
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,发现更多精彩内容 >>
提交
fc3dda47
编写于
9月 08, 2017
作者:
I
Ilya Chernikov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update compiler artifact according to the changes in master
上级
02ec70e9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
14 deletion
+15
-14
build.gradle.kts
build.gradle.kts
+1
-1
prepare/compiler/build.gradle.kts
prepare/compiler/build.gradle.kts
+14
-13
未找到文件。
build.gradle.kts
浏览文件 @
fc3dda47
...
...
@@ -96,7 +96,7 @@ extra["versions.protobuf-java"] = "2.6.1"
extra
[
"versions.javax.inject"
]
=
"1"
extra
[
"versions.jsr305"
]
=
"1.3.9"
extra
[
"versions.cli-parser"
]
=
"1.1.2"
extra
[
"versions.jansi"
]
=
"1.1
1
"
extra
[
"versions.jansi"
]
=
"1.1
6
"
extra
[
"versions.jline"
]
=
"3.3.1"
extra
[
"versions.junit"
]
=
"4.12"
extra
[
"versions.javaslang"
]
=
"2.0.6"
...
...
prepare/compiler/build.gradle.kts
浏览文件 @
fc3dda47
...
...
@@ -43,15 +43,16 @@ val compilerModules: Array<String> by rootProject.extra
val
packagesToRelocate
=
listOf
(
"com.intellij"
,
"com.google"
,
"com.sampullara"
,
"org.apache"
,
"org.jdom"
,
"org.picocontainer"
,
"jline"
,
"gnu"
,
"javax.inject"
,
"org.fusesource"
)
"com.google"
,
"com.sampullara"
,
"org.apache"
,
"org.jdom"
,
"org.picocontainer"
,
"org.jline"
,
"gnu"
,
"javax.inject"
,
"org.fusesource"
,
"kotlinx.coroutines"
)
val
ideaCoreSdkJars
:
Array
<
String
>
by
rootProject
.
extra
val
coreSdkJarsSimple
=
ideaCoreSdkJars
.
filterNot
{
it
==
"jdom"
||
it
==
"log4j"
}.
toTypedArray
()
...
...
@@ -81,6 +82,7 @@ dependencies {
fatJarContents
(
commonDep
(
"com.google.code.findbugs"
,
"jsr305"
))
fatJarContents
(
commonDep
(
"io.javaslang"
,
"javaslang"
))
fatJarContents
(
preloadedDeps
(
"json-org"
))
fatJarContents
(
preloadedDeps
(
"kotlinx-coroutines-core"
))
proguardLibraryJars
(
files
(
firstFromJavaHomeThatExists
(
"lib/rt.jar"
,
"../Classes/classes.jar"
),
firstFromJavaHomeThatExists
(
"lib/jsse.jar"
,
"../Classes/jsse.jar"
),
...
...
@@ -88,7 +90,6 @@ dependencies {
proguardLibraryJars
(
projectDist
(
":kotlin-stdlib"
))
proguardLibraryJars
(
projectDist
(
":kotlin-script-runtime"
))
proguardLibraryJars
(
projectDist
(
":kotlin-reflect"
))
proguardLibraryJars
(
preloadedDeps
(
"kotlinx-coroutines-core"
))
}
val
packCompiler
by
task
<
ShadowJar
>
{
...
...
@@ -99,9 +100,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"
)
}
}
ideaSdkDeps
(
"jps-model.jar"
,
subdir
=
"jps"
).
forEach
{
from
(
zipTree
(
it
)
)
{
exclude
(
"META-INF/services/**"
)
}
}
ideaSdkDeps
(
"oromatcher"
).
forEach
{
from
(
zipTree
(
it
)
)
{
exclude
(
"META-INF/jb/** META-INF/LICENSE"
)
}
}
ideaSdkCoreDeps
(
"jdom"
,
"log4j"
).
forEach
{
from
(
zipTree
(
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"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录