From b536699655e40c62cd603e1f98869786566604bd Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Tue, 10 Sep 2019 15:15:09 +0200 Subject: WIP on restructuring --- build.gradle | 73 ++++++++++++++++++++++-------------------------------------- 1 file changed, 26 insertions(+), 47 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 73636b24..2dfc4e01 100644 --- a/build.gradle +++ b/build.gradle @@ -15,11 +15,6 @@ allprojects { group 'org.jetbrains.dokka' version dokka_version - def repo = { - artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/internal/[module](.[ext])") - artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/[module](.[ext])") - artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/[revision]/([module]_[ext]/)[module](.[ext])") - } buildscript { repositories { @@ -27,7 +22,6 @@ allprojects { maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } maven { url "https://plugins.gradle.org/m2/" } - ivy(repo) } dependencies { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' @@ -45,7 +39,6 @@ allprojects { maven { url "https://dl.bintray.com/kotlin/kotlin-eap" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } maven { url "https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/$bundled_kotlin_compiler_version/maven" } - ivy(repo) maven { url "https://kotlin.bintray.com/kotlinx" } maven { url "https://dl.bintray.com/kotlin/kotlinx" } maven { url "https://dl.bintray.com/orangy/maven" } // TODO: remove this repository when kotlinx.cli is available in maven @@ -78,31 +71,7 @@ def bintrayPublication(project, List _publications) { }) } -def versions = DependenciesVersionGetter.getVersions(project, bundled_kotlin_compiler_version) - -ext.ideaVersion = versions["idea.build.id"] -ext.markdownVersion = versions["markdown.build.id"].replace("%20", " ") - -configurations { - ideaIC - intellijCore -} -repositories { - maven { url 'https://www.jetbrains.com/intellij-repository/snapshots' } - maven { url 'https://www.jetbrains.com/intellij-repository/releases' } -} - -dependencies { - intellijCore "com.jetbrains.intellij.idea:intellij-core:$ideaVersion" - ideaIC "com.jetbrains.intellij.idea:ideaIC:$ideaVersion" -} - -def intellijCoreAnalysis() { - return zipTree(configurations.intellijCore.singleFile).matching ({ - include("intellij-core-analysis.jar") - }) -} def ideaRT() { return zipTree(project.configurations.ideaIC.singleFile).matching ({ @@ -112,22 +81,6 @@ def ideaRT() { def repoLocation = uri(file("$buildDir/dist-maven")) -configurations { - kotlin_plugin_full -} - -dependencies { - final String ijVersion = "20" + ideaVersion.take(2) + "." + ideaVersion[2] - kotlin_plugin_full "teamcity:kotlin-plugin-$bundled_kotlin_compiler_version-IJ$ijVersion-1:$bundled_kotlin_compiler_version@zip" -} - -def kotlinPluginDependency() { - return zipTree(configurations.kotlin_plugin_full.singleFile).matching({ - include("Kotlin/lib/kotlin-plugin.jar") - }) -} - - allprojects { task publishToDistMaven { @@ -149,4 +102,30 @@ allprojects { } } +} + +ext.ivyrepo = { + artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/internal/[module](.[ext])") + artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/[module](.[ext])") + artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/[revision]/([module]_[ext]/)[module](.[ext])") +} + +repositories { + ivy(ivyrepo) + maven { url 'https://www.jetbrains.com/intellij-repository/snapshots' } + maven { url 'https://www.jetbrains.com/intellij-repository/releases' } +} + +configurations { + ideaIC + intellijCore +} +def versions = DependenciesVersionGetter.getVersions(project, bundled_kotlin_compiler_version) + +ext.ideaVersion = versions["idea.build.id"] +ext.markdownVersion = versions["markdown.build.id"].replace("%20", " ") + +dependencies { + intellijCore "com.jetbrains.intellij.idea:intellij-core:$ideaVersion" + ideaIC "com.jetbrains.intellij.idea:ideaIC:$ideaVersion" } \ No newline at end of file -- cgit From 0073c4c547dafaae5d465d4c410a52fd7fdc818d Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Fri, 24 Jan 2020 14:41:33 +0100 Subject: Cherry-pick 'analysis_rewrite_1.3.61' --- .idea/codeStyles/codeStyleConfig.xml | 1 + .idea/compiler.xml | 2 + .idea/jarRepositories.xml | 10 + build.gradle | 45 +-- core/build.gradle | 3 +- .../main/kotlin/analysis/AnalysisEnvironment.kt | 375 ++++++++++++++------- .../main/kotlin/analysis/CoreKotlinCacheService.kt | 18 +- .../main/kotlin/analysis/CoreProjectFileIndex.kt | 11 +- .../main/kotlin/analysis/DokkaAnalyzerFacades.kt | 164 --------- .../main/kotlin/analysis/JavaResolveExtension.kt | 7 +- .../DefaultDocumentationNodeMerger.kt | 3 +- coreDependencies/build.gradle | 23 +- gradle.properties | 8 +- .../dokka/gradle/MultiplatformProjectTest.kt | 4 +- 14 files changed, 321 insertions(+), 353 deletions(-) delete mode 100644 core/src/main/kotlin/analysis/DokkaAnalyzerFacades.kt (limited to 'build.gradle') diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index 79ee123c..6e6eec11 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index f165d41a..feb731d8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -58,6 +58,8 @@ + + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 8e7bd752..b5925b37 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -76,5 +76,15 @@