Skip to content

Commit ccae256

Browse files
authored
Merge pull request #12 from build-extensions-oss/bytecode8
Switch to Java8 bytecode
2 parents 4d28c11 + 4368291 commit ccae256

File tree

5 files changed

+23
-9
lines changed

5 files changed

+23
-9
lines changed

buildSrc/src/main/kotlin/kotlin-convention.gradle.kts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import org.gradle.kotlin.dsl.configure
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
4+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
35

46
plugins {
57
`java-library`
@@ -17,11 +19,24 @@ repositories {
1719
}
1820

1921
configure<KotlinJvmProjectExtension> {
20-
// fix the toolchain for now
22+
// Set the toolchain 11 to do everything, because kotest doesn't support Java 8
2123
jvmToolchain(11)
2224
}
2325

26+
27+
tasks.withType<KotlinCompile>().configureEach {
28+
// manually decrease the version for releasing classes
29+
kotlinOptions {
30+
jvmTarget = "1.8"
31+
}
32+
}
33+
tasks.withType<JavaCompile>().configureEach {
34+
// synchronize Java version with Kotlin compiler
35+
options.release.set(8)
36+
}
37+
2438
dependencies {
39+
// compile only - we will use Gradle dependency in real life
2540
compileOnly(kotlin("stdlib"))
2641
compileOnly(kotlin("stdlib-jdk8"))
2742
}

gradle-plugin-integration-test-utils/gradle.lockfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# This file is expected to be part of source control.
44
com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath,testRuntimeClasspath
55
org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath
6-
org.jetbrains.kotlin:kotlin-stdlib:1.9.20=testRuntimeClasspath
7-
org.jetbrains:annotations:13.0=testRuntimeClasspath
86
org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath
97
org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath
108
empty=

gradle-plugin-test-utils/gradle.lockfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
# This file is expected to be part of source control.
44
com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath,testRuntimeClasspath
55
org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath
6-
org.jetbrains.kotlin:kotlin-stdlib:1.9.20=testRuntimeClasspath
7-
org.jetbrains:annotations:13.0=testRuntimeClasspath
86
org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath
97
org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath
108
empty=

gradle-plugin-utils/gradle.lockfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ net.java.dev.jna:jna:5.9.0=testRuntimeClasspath
5151
org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath
5252
org.javassist:javassist:3.28.0-GA=testRuntimeClasspath
5353
org.jetbrains.kotlin:kotlin-reflect:1.8.20=testRuntimeClasspath
54-
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=testRuntimeClasspath
54+
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20=testRuntimeClasspath
5555
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=testRuntimeClasspath
5656
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=testRuntimeClasspath
57-
org.jetbrains.kotlin:kotlin-stdlib:1.9.20=testRuntimeClasspath
57+
org.jetbrains.kotlin:kotlin-stdlib:1.8.20=testRuntimeClasspath
5858
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.0=testRuntimeClasspath
5959
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.0=testRuntimeClasspath
6060
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0=testRuntimeClasspath

gradle.properties

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kotlin.code.style=official
22

33
group=io.github.build-extensions-oss
4-
version=0.5.0
4+
version=0.5.1
55

66
projectName=Gradle Plugin Utilities
77
projectDescription=A collection of utilities for developing Gradle plugins
@@ -14,4 +14,7 @@ githubRepo=build-extensions-oss/gradle-plugin-utils
1414
# Enable publication tasks by default
1515
mavenCentralPublishing=true
1616
# Sign everything by default - otherwise Maven Central will reject us
17-
signAllPublications=true
17+
signAllPublications=true
18+
19+
# don't add stdlib dependency - we will not reference it, we will use it from Gradle
20+
kotlin.stdlib.default.dependency=false

0 commit comments

Comments
 (0)