[SVN] r2672 Gradle Plugin in /Libraries/twister-plugin-gradle/

[MOD] Kotlin 1.2.71 + DSL RC11 [COM] Release 3.1.4.14-27-27.2
TWiStErRob · Sep 29, 2018 · 680ee42 · 680ee42
1 parent 8511db3
commit 680ee42
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/plugin/README.md b/plugin/README.md
@@ -4,9 +4,7 @@
 
 3.0.1.10-19-26.0 Gradle 4.1-4.2 (Gradle 4.3 deprecated bootClasspath)
 
-Future: 3.1.0.* Gradle 4.3-4.4
-
-3.1.\[2-4].14-27-27.0 Gradle 4.3, 4.4, 4.4.1, 4.5, 4.5.1 (works with 4.6+, but warns)
+3.1.\[2-4].14-27-27.x Gradle 4.3, 4.4, 4.4.1, 4.5, 4.5.1 (works with 4.6+, but warns)
 
 ## Release
 ### Testing

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 		maven { name = "TWiStErRob Bintray"; url = "https://dl.bintray.com/twisterrob/maven" }
 	}
 	dependencies {
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.71'
 		classpath 'net.twisterrob.gradle:twister-gradle-test:0.5'
 	}
 }

diff --git a/plugin/plugin/build.gradle b/plugin/plugin/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'groovy'
 apply plugin: 'kotlin'
 apply plugin: 'net.twisterrob.gradle.test'
-version = '3.1.4.14-27-27.1'
+version = '3.1.4.14-27-27.2'
 
 dependencies { // last checked 2018-06-09 (all latest)
 	implementation gradleApi()
 	implementation 'org.tmatesoft.svnkit:svnkit:1.9.3' // https://mvnrepository.com/artifact/org.tmatesoft.svnkit/svnkit
 	implementation 'org.tmatesoft.svnkit:svnkit-cli:1.9.3'
 	implementation 'org.ajoberstar:gradle-git:1.7.2' // https://github.com/ajoberstar/gradle-git/releases
 	implementation 'com.android.tools.build:gradle:3.1.4' // https://developer.android.com/studio/releases/gradle-plugin.html#updating-gradle
-	implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60'
-	implementation ('org.gradle:gradle-kotlin-dsl:0.17.5') {
+	implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.71'
+	implementation ('org.gradle:gradle-kotlin-dsl:1.0-rc-11') {
 		transitive = false // make sure to not pull in kotlin-compiler-embeddable
 	}
 }
@@ -32,9 +32,9 @@ dependencies { // test
 	testImplementation "org.hamcrest:java-hamcrest:2.0.0.0"
 	testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0"
 	testImplementation "org.jetbrains:annotations:16.0.2"
-	testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.60"
-	testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.2.60"
-	testImplementation "com.jakewharton.dex:dex-method-list:3.1.0"
+	testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71"
+	testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.2.71"
+	testImplementation "com.jakewharton.dex:dex-member-list:3.2.1"
 }
 
 project.with {

diff --git a/plugin/plugin/src/main/kotlin/net/twisterrob/gradle/kotlin/KotlinPlugin.kt b/plugin/plugin/src/main/kotlin/net/twisterrob/gradle/kotlin/KotlinPlugin.kt
@@ -6,7 +6,7 @@ import net.twisterrob.gradle.base.BasePlugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.get
 
-const val VERSION_KOTLIN = "1.2.60"
+const val VERSION_KOTLIN = "1.2.71"
 
 class KotlinPlugin : BasePlugin() {