From 726ac3aa524ce8cb7d6bc10ae95b21f3ecbe6bc6 Mon Sep 17 00:00:00 2001
From: "Dmitry.Tretyakov" <dtretyakov@gmail.com>
Date: Thu, 16 Mar 2017 11:52:10 +0300
Subject: [PATCH] Update to kotlin 1.1.1

---
 build.gradle                      | 11 +----------
 gradle.properties                 |  1 +
 plugin-dotnet-agent/build.gradle  |  4 +++-
 plugin-dotnet-common/build.gradle |  4 +++-
 plugin-dotnet-server/build.gradle |  9 +++++++--
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 gradle.properties

diff --git a/build.gradle b/build.gradle
index cf700c270..b8f702071 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,12 @@
 plugins {
-    id "com.zoltu.kotlin" version "1.0.5"
-    id "com.github.rodm.teamcity-server" version "0.10"
+    id "org.jetbrains.kotlin.jvm" version "1.1.1"
 }
 
 ext {
-    kotlinVersion = '1.0.5-2'
-
     def correctVersion = project.hasProperty('versionNumber') && property('versionNumber') ==~ /\d+\.\d+\.\d+.*/
     versionNumber = correctVersion ? property('versionNumber') : 'SNAPSHOT-' + new Date().format('yyyyMMddHHmmss')
     projectIds = ['group': 'teamcity-dotnet-plugin', 'version': versionNumber, 'artifact': 'dotnet-core-plugin']
-
     teamcityVersion = project.hasProperty('teamcityVersion') ? property('teamcityVersion') : '9.0'
-
-    teamcityDir = project.hasProperty('teamcityDir') ? property('teamcityDir') : "$rootDir/servers/TeamCity-${teamcityVersion}"
-    teamcityDataDir = "$rootDir/data/" + (teamcityVersion =~ /(\d+\.\d+).*/)[0][1]
-
-    teamcityJavaHome = System.properties['java.home']
 }
 
 group = projectIds.group
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 000000000..876581d7a
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+kotlinVersion=1.1.1
\ No newline at end of file
diff --git a/plugin-dotnet-agent/build.gradle b/plugin-dotnet-agent/build.gradle
index 625ff0de2..3ba90911f 100644
--- a/plugin-dotnet-agent/build.gradle
+++ b/plugin-dotnet-agent/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.github.rodm.teamcity-agent'
+plugins {
+    id 'com.github.rodm.teamcity-agent' version "0.11"
+}
 
 teamcity {
     version = teamcityVersion
diff --git a/plugin-dotnet-common/build.gradle b/plugin-dotnet-common/build.gradle
index 120029ab8..9ce48eade 100644
--- a/plugin-dotnet-common/build.gradle
+++ b/plugin-dotnet-common/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.github.rodm.teamcity-common'
+plugins{
+    id 'com.github.rodm.teamcity-common' version "0.11"
+}
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
diff --git a/plugin-dotnet-server/build.gradle b/plugin-dotnet-server/build.gradle
index 08120e767..3cab80986 100644
--- a/plugin-dotnet-server/build.gradle
+++ b/plugin-dotnet-server/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.github.rodm.teamcity-server'
+plugins {
+    id 'com.github.rodm.teamcity-server' version "0.11"
+}
 
 teamcity {
     version = teamcityVersion
@@ -19,4 +21,7 @@ dependencies {
 }
 
 serverPlugin.version = null
-serverPlugin.baseName = projectIds.artifact
\ No newline at end of file
+serverPlugin.baseName = projectIds.artifact
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
\ No newline at end of file