Update to kotlin 1.1.1

JetBrains · Mar 16, 2017 · 726ac3a · 726ac3a
1 parent ed38a2e
commit 726ac3a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git 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
@@ -0,0 +1 @@
+kotlinVersion=1.1.1
diff --git 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
@@ -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
@@ -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
+serverPlugin.baseName = projectIds.artifact
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7