diff options
| -rw-r--r-- | build.gradle | 22 | ||||
| -rw-r--r-- | core/build.gradle | 15 | ||||
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | lib/kotlin-ide-common.jar | bin | 469425 -> 0 bytes | |||
| -rw-r--r-- | lib/markdown.jar | bin | 393003 -> 0 bytes | |||
| -rw-r--r-- | runners/fatjar/build.gradle | 2 |
6 files changed, 24 insertions, 17 deletions
diff --git a/build.gradle b/build.gradle index 2acdec8f..b89a8c92 100644 --- a/build.gradle +++ b/build.gradle @@ -2,19 +2,20 @@ allprojects { group 'org.jetbrains.dokka' version dokka_version + def repo = { + artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/maven/org/jetbrains/kotlin/[module]/[revision]/[module]-[revision](.[ext])") + artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/maven/org/jetbrains/kotlin/[module]/[revision]/[module]-[revision]-source.jar") + artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/internal/[module](.[ext])") + } + buildscript { repositories { mavenCentral() jcenter() - maven { - url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" - } - maven { - url "https://dl.bintray.com/kotlin/kotlin-dev" - } - maven { - url "https://plugins.gradle.org/m2/" - } + maven { url "http://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.7' @@ -27,9 +28,10 @@ allprojects { repositories { mavenCentral() mavenLocal() - maven { url "http://dl.bintray.com/kotlin/kotlin-eap-1.1" } + maven { url "http://dl.bintray.com/kotlin/kotlin-eap" } maven { url "https://dl.bintray.com/kotlin/kotlin-dev" } maven { url 'https://jitpack.io' } + ivy(repo) } } diff --git a/core/build.gradle b/core/build.gradle index c705e2cf..3d3e2317 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -2,7 +2,7 @@ import javax.tools.ToolProvider buildscript { dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_compiler_to_compile_core_version" } } @@ -11,18 +11,19 @@ apply plugin: 'kotlin' sourceCompatibility = 1.6 dependencies { - compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version - compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_compiler_version" + compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_compiler_version" compile group: 'com.google.inject', name: 'guice', version: '3.0' compile "org.jsoup:jsoup:1.8.3" compile files("../lib/intellij-core-analysis.jar") - compile group: 'org.jetbrains.kotlin', name: 'kotlin-compiler', version: kotlin_version - compile group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime', version: kotlin_version - compile files("../lib/kotlin-ide-common.jar") - compile files("../lib/markdown.jar") + compile "teamcity:kotlin-compiler:$kotlin_compiler_version" + compile "teamcity:kotlin-script-runtime:$kotlin_compiler_version" + + compile "teamcity:kotlin-ide-common:$kotlin_compiler_version" + compile "teamcity:markdown:$kotlin_compiler_version" //tools.jar def toolsJar = files(((URLClassLoader) ToolProvider.getSystemToolClassLoader()).getURLs().findAll { it.path.endsWith("jar") }) diff --git a/gradle.properties b/gradle.properties index 4d4e40ad..516cd0eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,8 @@ dokka_publication_channel=dokka #Kotlin compiler and plugin kotlin_version=1.1.51 +kotlin_compiler_version=1.2.20-dev-65 +kotlin_compiler_to_compile_core_version=1.2.0-rc-39 kotlin_for_gradle_version=1.0.7 ant_version=1.9.6 diff --git a/lib/kotlin-ide-common.jar b/lib/kotlin-ide-common.jar Binary files differdeleted file mode 100644 index 98648313..00000000 --- a/lib/kotlin-ide-common.jar +++ /dev/null diff --git a/lib/markdown.jar b/lib/markdown.jar Binary files differdeleted file mode 100644 index e61f954c..00000000 --- a/lib/markdown.jar +++ /dev/null diff --git a/runners/fatjar/build.gradle b/runners/fatjar/build.gradle index e3bea7ed..0656ba48 100644 --- a/runners/fatjar/build.gradle +++ b/runners/fatjar/build.gradle @@ -30,6 +30,8 @@ shadowJar { exclude 'fileTemplates/**' exclude 'inspectionDescriptions/**' exclude 'intentionDescriptions/**' + + relocate('kotlin.reflect.full', 'kotlin.reflect') } apply plugin: 'maven-publish' |