Skip to content

Commit 860a0f7

Browse files
committed
chore: use Autostyle 4.0 for buildSrc
1 parent 241d46f commit 860a0f7

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

buildSrc/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3+
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
24

35
/*
46
* Copyright 2019 Vladimir Sitnikov <[email protected]>
@@ -56,9 +58,9 @@ fun Project.applyKotlinProjectConventions() {
5658
sourceCompatibility = JavaVersion.VERSION_1_8
5759
targetCompatibility = JavaVersion.VERSION_1_8
5860
}
59-
tasks.withType<KotlinCompile> {
60-
kotlinOptions {
61-
jvmTarget = "1.8"
61+
tasks.withType<KotlinJvmCompile> {
62+
compilerOptions {
63+
jvmTarget = JvmTarget.JVM_1_8
6264
}
6365
}
6466
}

buildSrc/gradle.properties

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,3 @@
1717
org.gradle.parallel=true
1818
kotlin.parallel.tasks.in.project=true
1919
checksum.violation.log.level=lifecycle
20-
21-
com.github.vlsi.checksum-dependency.sha512=85307929539D50B53F4F652330D1B5C8118A6FC100704AF676EA765A4E4CF653C06EEB96B3A67DEA204188ED6B48B0A27A7C4B70C548BAC0B6A9EDDD8B35D661
22-
com.github.vlsi.checksum-dependency.version=1.88
23-
24-
# Plugins
25-
com.github.autostyle.version=3.2

buildSrc/settings.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717

1818
pluginManagement {
1919
plugins {
20-
fun String.v() = extra["$this.version"].toString()
21-
fun PluginDependenciesSpec.idv(id: String, key: String = id) = id(id) version key.v()
22-
23-
idv("com.github.autostyle")
20+
id("com.github.autostyle") version "4.0"
2421
}
2522
}
2623

0 commit comments

Comments
 (0)