From fec5256e2f3b68596508d5f5769761d84231003b Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 24 Oct 2017 17:49:04 +0300 Subject: Fix building of maven plugin --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 44e510d6..4d4e40ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,11 +8,11 @@ kotlin_for_gradle_version=1.0.7 ant_version=1.9.6 #Maven plugin dependencies -maven_version=3.0.5 +maven_version=3.5.0 maven_archiver_version=2.5 plexus_utils_version=3.0.22 plexus_archiver_version=3.4 -maven_plugin_tools_version=3.4 +maven_plugin_tools_version=3.5 #For CI mvn=mvn \ No newline at end of file -- cgit From f3c83f4751814984fb9aedeb991725620a287f33 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 8 Nov 2017 19:51:23 +0300 Subject: Download dependencies from TeamCity --- gradle.properties | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gradle.properties') 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 -- cgit From 4626531f95e60e03086da163cde5edf5411a8d9b Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 9 Nov 2017 21:43:37 +0300 Subject: Drop dependency on intellij-core-analysis Instead of it, download idea.jar and manually strip it Also, depends on same as kotlin-compiler openapi version --- gradle.properties | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 516cd0eb..29da4702 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,9 @@ 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 +#IntelliJ plugin to download openapi.jar +gradle_intellij_plugin_version=0.3.0-SNAPSHOT + ant_version=1.9.6 #Maven plugin dependencies -- cgit From bd92d65eba154d756c47c0ea2f304db04ac0ffae Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 20 Nov 2017 21:38:15 +0300 Subject: Advance Kotlin Compiler version to pinned --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 29da4702..154d7776 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ dokka_publication_channel=dokka #Kotlin compiler and plugin kotlin_version=1.1.51 -kotlin_compiler_version=1.2.20-dev-65 +kotlin_compiler_version=1.2.20-dev-175 kotlin_compiler_to_compile_core_version=1.2.0-rc-39 kotlin_for_gradle_version=1.0.7 -- cgit From f94beaa25f07333ad47738d5d7fafdd3dd302b04 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 14 Nov 2017 16:19:46 +0300 Subject: Clarify Kotlin Versions and config in project --- gradle.properties | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 154d7776..d109426b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,9 @@ dokka_version=0.9.16 dokka_publication_channel=dokka #Kotlin compiler and plugin -kotlin_version=1.1.51 -kotlin_compiler_version=1.2.20-dev-175 -kotlin_compiler_to_compile_core_version=1.2.0-rc-39 -kotlin_for_gradle_version=1.0.7 +bundled_kotlin_compiler_version=1.2.20-dev-175 +kotlin_version=1.2.0-rc-39 +kotlin_for_gradle_runtime_version=1.0.7 #IntelliJ plugin to download openapi.jar gradle_intellij_plugin_version=0.3.0-SNAPSHOT -- cgit From cc2a478ff0f1831be2333bf97712e1ffe9d764fe Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Fri, 24 Nov 2017 23:57:04 +0300 Subject: Use kotlin-ide-common with fixed package docs resolution --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index d109426b..e046e1a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dokka_version=0.9.16 dokka_publication_channel=dokka #Kotlin compiler and plugin -bundled_kotlin_compiler_version=1.2.20-dev-175 +bundled_kotlin_compiler_version=1.2.20-dev-419 kotlin_version=1.2.0-rc-39 kotlin_for_gradle_runtime_version=1.0.7 -- cgit From 9b90007eff1bd046afa8dd4be71502f8038cf292 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 13 Dec 2017 23:22:32 +0300 Subject: Update Kotlin version --- gradle.properties | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index e046e1a3..6b9383bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,9 @@ dokka_publication_channel=dokka #Kotlin compiler and plugin bundled_kotlin_compiler_version=1.2.20-dev-419 -kotlin_version=1.2.0-rc-39 +kotlin_version=1.2.0 kotlin_for_gradle_runtime_version=1.0.7 -#IntelliJ plugin to download openapi.jar -gradle_intellij_plugin_version=0.3.0-SNAPSHOT - ant_version=1.9.6 #Maven plugin dependencies -- cgit From 56213b9d66a78fdd35c2826c6edc3f36d491ff32 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 29 Jan 2018 19:53:23 +0300 Subject: Update Gradle Kotlin Runtime dependencies version to 1.1 Dokka drops support for Gradle less then 3.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 6b9383bf..4a6475b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ dokka_publication_channel=dokka #Kotlin compiler and plugin bundled_kotlin_compiler_version=1.2.20-dev-419 kotlin_version=1.2.0 -kotlin_for_gradle_runtime_version=1.0.7 +kotlin_for_gradle_runtime_version=1.1.60 ant_version=1.9.6 -- cgit From 3eb23215edcd1cf92966f8d39afe754fef0c7a19 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Wed, 21 Feb 2018 11:51:06 +0300 Subject: Update bundled kotlin compiler --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index 4a6475b1..cabae269 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ dokka_version=0.9.16 dokka_publication_channel=dokka #Kotlin compiler and plugin -bundled_kotlin_compiler_version=1.2.20-dev-419 -kotlin_version=1.2.0 +bundled_kotlin_compiler_version=1.2.40-dev-529 +kotlin_version=1.2.21 kotlin_for_gradle_runtime_version=1.1.60 ant_version=1.9.6 -- cgit