Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
5fe47ffb
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,发现更多精彩内容 >>
提交
5fe47ffb
编写于
6月 15, 2020
作者:
N
Natalia Selezneva
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Workaround for bug in GradleInstallationManager.resolveGradleVersion()
Wrong gradle version when wrapper is used fixed in 201
上级
7a479944
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
2 deletion
+16
-2
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt
...brains/kotlin/idea/scripting/gradle/GradleImportHelper.kt
+10
-0
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201
...ns/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201
+4
-0
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
...in/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
+2
-2
未找到文件。
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt
浏览文件 @
5fe47ffb
...
...
@@ -11,6 +11,7 @@ import com.intellij.notification.*
import
com.intellij.openapi.actionSystem.AnAction
import
com.intellij.openapi.actionSystem.AnActionEvent
import
com.intellij.openapi.application.ApplicationManager
import
com.intellij.openapi.components.ServiceManager
import
com.intellij.openapi.externalSystem.importing.ImportSpecBuilder
import
com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import
com.intellij.openapi.externalSystem.util.ExternalSystemUtil
...
...
@@ -24,6 +25,7 @@ import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle
import
org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager
import
org.jetbrains.kotlin.idea.util.application.getServiceSafe
import
org.jetbrains.kotlin.psi.UserDataProperty
import
org.jetbrains.plugins.gradle.service.GradleInstallationManager
import
org.jetbrains.plugins.gradle.settings.GradleProjectSettings
import
org.jetbrains.plugins.gradle.util.GradleConstants
...
...
@@ -120,4 +122,12 @@ private class ScriptConfigurationChangedNotification(val project: Project) :
runPartialGradleImport
(
project
)
}
}
}
fun
getGradleVersion
(
project
:
Project
,
settings
:
GradleProjectSettings
):
String
{
// workaround for bug in settings.resolveGradleVersion().version (fixed in 201)
return
GradleInstallationManager
.
getGradleVersion
(
ServiceManager
.
getService
(
GradleInstallationManager
::
class
.
java
)
.
getGradleHome
(
project
,
settings
.
externalProjectPath
)
?.
path
)
?:
GradleVersion
.
current
().
version
}
\ No newline at end of file
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleImportHelper.kt.201
浏览文件 @
5fe47ffb
...
...
@@ -104,4 +104,8 @@ class LoadConfigurationAction : AnAction(
&&
isGradleKotlinScript
(
it
)
}
}
}
fun
getGradleVersion
(
project
:
Project
,
settings
:
GradleProjectSettings
):
String
{
return
settings
.
resolveGradleVersion
().
version
}
\ No newline at end of file
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
浏览文件 @
5fe47ffb
...
...
@@ -273,7 +273,7 @@ class GradleBuildRootsManager(val project: Project) : GradleBuildRootsLocator(),
val
actualSettings
=
getGradleProjectSettings
(
workingDir
)
val
buildRoot
=
getBuildRootByWorkingDir
(
workingDir
)
val
version
=
gradleVersion
?:
actualSettings
?.
resolveGradleVersion
()
?.
version
val
version
=
gradleVersion
?:
actualSettings
?.
let
{
getGradleVersion
(
project
,
it
)
}
return
when
{
buildRoot
!=
null
->
{
when
{
...
...
@@ -302,7 +302,7 @@ class GradleBuildRootsManager(val project: Project) : GradleBuildRootsLocator(),
remove
(
rootPath
)
return
null
}
else
{
val
gradleVersion
=
version
?:
settings
.
resolveGradleVersion
().
version
val
gradleVersion
=
version
?:
getGradleVersion
(
project
,
settings
)
val
newRoot
=
loadLinkedRoot
(
settings
,
gradleVersion
)
add
(
newRoot
)
return
newRoot
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录