Build: Remove intellijEnforceCommunitySdk flag, use currentIde instead
Setup ultimate repositories only when currentIde is Intellij
This commit is contained in:
@@ -30,11 +30,9 @@ private fun Project.intellijRepoDir() = File("${project.rootDir.absoluteFile}/bu
|
|||||||
|
|
||||||
fun RepositoryHandler.intellijSdkRepo(project: Project): IvyArtifactRepository = ivy {
|
fun RepositoryHandler.intellijSdkRepo(project: Project): IvyArtifactRepository = ivy {
|
||||||
val baseDir = project.intellijRepoDir()
|
val baseDir = project.intellijRepoDir()
|
||||||
val intellijEnforceCommunitySdk = project.getBooleanProperty("intellijEnforceCommunitySdk") == true
|
|
||||||
|
|
||||||
setUrl(baseDir)
|
setUrl(baseDir)
|
||||||
|
|
||||||
if (!intellijEnforceCommunitySdk) {
|
if (IdeVersionConfigurator.currentIde.kind == Ide.Kind.IntelliJ) {
|
||||||
ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate.ivy.xml")
|
ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate.ivy.xml")
|
||||||
ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellijUltimate.plugin.[module].ivy.xml")
|
ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellijUltimate.plugin.[module].ivy.xml")
|
||||||
artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate/lib/[artifact](-[classifier]).jar")
|
artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]Ultimate/lib/[artifact](-[classifier]).jar")
|
||||||
|
|||||||
@@ -10,4 +10,3 @@ kotlin.compiler.newInferenceEnabled=true
|
|||||||
#signingRequired=true
|
#signingRequired=true
|
||||||
|
|
||||||
intellijUltimateEnabled=false
|
intellijUltimateEnabled=false
|
||||||
intellijEnforceCommunitySdk=true
|
|
||||||
@@ -10,4 +10,3 @@ kotlin.compiler.newInferenceEnabled=true
|
|||||||
#signingRequired=true
|
#signingRequired=true
|
||||||
|
|
||||||
intellijUltimateEnabled=false
|
intellijUltimateEnabled=false
|
||||||
intellijEnforceCommunitySdk=true
|
|
||||||
@@ -10,4 +10,3 @@ kotlin.compiler.newInferenceEnabled=true
|
|||||||
#signingRequired=true
|
#signingRequired=true
|
||||||
|
|
||||||
intellijUltimateEnabled=false
|
intellijUltimateEnabled=false
|
||||||
intellijEnforceCommunitySdk=true
|
|
||||||
Reference in New Issue
Block a user