upgraded kotlin & gradle versions

Nayan Hajratwala · Nayan Hajratwala · commit 095aa6e32022 · 2021-04-12T16:17:12.000-04:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
 	`java-gradle-plugin`
 	id("com.gradle.plugin-publish") version "0.11.0"
 	id("org.sonarqube") version "2.8"
-	kotlin("jvm") version "1.3.70"
+	kotlin("jvm") version "1.4.31"
 	`maven-publish`
 }
 
@@ -39,7 +39,6 @@ publishing {
 }
 
 dependencies {
-	implementation(kotlin("stdlib-jdk8"))
 	implementation(kotlin("reflect"))
 	implementation(group = "khttp", name = "khttp", version = "1.0.0")
 	implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")
@@ -68,11 +67,8 @@ pluginBundle {
 	tags = listOf("springdoc", "openapi", "swagger")
 }
 
-tasks {
-	compileKotlin {
-		kotlinOptions.jvmTarget = "1.8"
-	}
-	compileTestKotlin {
-		kotlinOptions.jvmTarget = "1.8"
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+	kotlinOptions {
+		jvmTarget = "1.8"
 	}
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`java-gradle-plugin`
`3`	`3`	`id("com.gradle.plugin-publish") version "0.11.0"`
`4`	`4`	`id("org.sonarqube") version "2.8"`
`5`		`- kotlin("jvm") version "1.3.70"`
	`5`	`+ kotlin("jvm") version "1.4.31"`
`6`	`6`	`maven-publish`
`7`	`7`	`}`
`8`	`8`
`@@ -39,7 +39,6 @@ publishing {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`dependencies {`
`42`		`- implementation(kotlin("stdlib-jdk8"))`
`43`	`42`	`implementation(kotlin("reflect"))`
`44`	`43`	`implementation(group = "khttp", name = "khttp", version = "1.0.0")`
`45`	`44`	`implementation(group = "com.google.code.gson", name = "gson", version = "2.8.6")`
`@@ -68,11 +67,8 @@ pluginBundle {`
`68`	`67`	`tags = listOf("springdoc", "openapi", "swagger")`
`69`	`68`	`}`
`70`	`69`
`71`		`-tasks {`
`72`		`- compileKotlin {`
`73`		`- kotlinOptions.jvmTarget = "1.8"`
`74`		`- }`
`75`		`- compileTestKotlin {`
`76`		`- kotlinOptions.jvmTarget = "1.8"`
	`70`	`+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {`
	`71`	`+ kotlinOptions {`
	`72`	`+ jvmTarget = "1.8"`
`77`	`73`	`}`
`78`	`74`	`}`