From b3e33f620a387d4623ed7f6d7665fcbed98efffb Mon Sep 17 00:00:00 2001 From: aleksZubakov Date: Fri, 13 Jul 2018 16:18:16 +0300 Subject: Change compiler dependency version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index df409630..20953140 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dokka_version=0.9.18-SNAPSHOT dokka_publication_channel=dokka #Kotlin compiler and plugin -bundled_kotlin_compiler_version=1.2.60-dev-157 +bundled_kotlin_compiler_version=1.2.70-dev-235 kotlin_version=1.2.21 kotlin_for_gradle_runtime_version=1.1.60 -- cgit From b3913cdb97f1f2863c9e4001e0aacdca857f7ba5 Mon Sep 17 00:00:00 2001 From: Eugene Petrenko Date: Tue, 11 Sep 2018 18:46:17 +0300 Subject: include TeamCity BUILD_NUMBER into build number --- build.gradle | 4 ++++ gradle.properties | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/build.gradle b/build.gradle index 7ea6dd9c..d93d8601 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,10 @@ import org.jetbrains.DependenciesVersionGetter allprojects { + ext { + dokka_version = dokka_version_base + (System.getenv("BUILD_NUMBER") ?: "-SNAPSHOT") + } + group 'org.jetbrains.dokka' version dokka_version diff --git a/gradle.properties b/gradle.properties index 20953140..e2f738af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -dokka_version=0.9.18-SNAPSHOT +dokka_version_base=0.9.18 dokka_publication_channel=dokka #Kotlin compiler and plugin -- cgit From 39f91ce66c234c9bc7ce67d7d661f3882b1a58c4 Mon Sep 17 00:00:00 2001 From: Eugene Petrenko Date: Tue, 11 Sep 2018 19:31:13 +0300 Subject: download maven from Gradle --- gradle.properties | 3 --- runners/maven-plugin/build.gradle | 22 ++++++++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index e2f738af..f5462014 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,3 @@ maven_archiver_version=2.5 plexus_utils_version=3.0.22 plexus_archiver_version=3.4 maven_plugin_tools_version=3.5 - -#For CI -mvn=mvn \ No newline at end of file diff --git a/runners/maven-plugin/build.gradle b/runners/maven-plugin/build.gradle index 79a8c22b..7e94058e 100644 --- a/runners/maven-plugin/build.gradle +++ b/runners/maven-plugin/build.gradle @@ -19,7 +19,13 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { } } +configurations { + maven +} + dependencies { + maven group: "org.apache.maven", name: 'apache-maven', version: maven_version, classifier: 'bin', ext: 'zip' + shadow project(":runners:fatjar") shadow "org.apache.maven:maven-core:$maven_version" shadow "org.apache.maven:maven-model:$maven_version" @@ -31,6 +37,18 @@ dependencies { shadow "com.github.olivergondza:maven-jdk-tools-wrapper:0.1" } +final File mavenHome = new File(buildDir, "maven-bin") +final File mvn = new File(mavenHome, "apache-maven-$maven_version/bin/mvn") + +tasks.clean.doLast { + delete mavenHome +} + +task setupMaven(type: Sync) { + from configurations.maven.collect{ zipTree(it) } + into "$buildDir/maven-bin" +} + task generatePom() { inputs.file(new File(projectDir, "pom.tpl.xml")) outputs.file(new File(buildDir, "pom.xml")) @@ -58,14 +76,14 @@ task mergeClassOutputs doLast { } } -task pluginDescriptor(type: CrossPlatformExec) { +task pluginDescriptor(type: CrossPlatformExec, dependsOn: setupMaven) { workingDir buildDir commandLine mvn, '-e', '-B', 'org.apache.maven.plugins:maven-plugin-plugin:descriptor' dependsOn mergeClassOutputs } -task helpMojo(type: CrossPlatformExec) { +task helpMojo(type: CrossPlatformExec, dependsOn: setupMaven) { workingDir buildDir commandLine mvn, '-e', '-B', 'org.apache.maven.plugins:maven-plugin-plugin:helpmojo' -- cgit From a966f5917a2421507ad57a98f6dfb9d5bdbbe9ff Mon Sep 17 00:00:00 2001 From: Eugene Petrenko Date: Wed, 12 Sep 2018 17:56:44 +0300 Subject: update kotlin (bundled and compiler) --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index f5462014..af64b954 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ dokka_version_base=0.9.18 dokka_publication_channel=dokka #Kotlin compiler and plugin -bundled_kotlin_compiler_version=1.2.70-dev-235 -kotlin_version=1.2.21 +bundled_kotlin_compiler_version=1.3.0-dev-498 +kotlin_version=1.2.61 kotlin_for_gradle_runtime_version=1.1.60 ant_version=1.9.6 -- cgit From 6a2eae521d49a9b996d5326ed2339b0d8f94b60f Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 20 Sep 2018 19:51:46 +0300 Subject: Advance Kotlin version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index af64b954..ec329d35 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dokka_version_base=0.9.18 dokka_publication_channel=dokka #Kotlin compiler and plugin -bundled_kotlin_compiler_version=1.3.0-dev-498 +bundled_kotlin_compiler_version=1.3.20-dev-322 kotlin_version=1.2.61 kotlin_for_gradle_runtime_version=1.1.60 -- cgit From 341fb3d5d967b6b69e02460d510683cef2990436 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Tue, 2 Oct 2018 16:34:39 +0300 Subject: Update bundled kotlin compiler to 1.3.20-dev-564 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gradle.properties') diff --git a/gradle.properties b/gradle.properties index ec329d35..eec65c0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ dokka_version_base=0.9.18 dokka_publication_channel=dokka #Kotlin compiler and plugin -bundled_kotlin_compiler_version=1.3.20-dev-322 +bundled_kotlin_compiler_version=1.3.20-dev-564 kotlin_version=1.2.61 kotlin_for_gradle_runtime_version=1.1.60 -- cgit