Skip to content

Commit a2d5fcd

Browse files
Abduqodiri Qurbonzodaqurbonzoda
authored andcommitted
Upgrade jvmTarget to 1.8
1 parent 7b88baf commit a2d5fcd

File tree

5 files changed

+2
-17
lines changed

5 files changed

+2
-17
lines changed

.teamcity/additionalConfiguration.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,5 @@
66
import jetbrains.buildServer.configs.kotlin.v2019_2.Project
77

88
fun Project.additionalConfiguration() {
9-
params {
10-
param("env.JDK_6", "%env.JDK_16%")
11-
}
129
subProject(benchmarksProject(knownBuilds.buildVersion))
1310
}

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ Add dependencies (you can also add other modules that you need):
158158

159159
## Building from source
160160

161-
> :information_source: To build this project you will need to have a path to JDK 6 specified with the `JDK_6` environment variable or gradle property.
162-
> For the local development purposes any JDK newer than that can be used instead.
163-
164161
You can build and install artifacts to maven local with:
165162

166163
gradlew build install

benchmarks/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ plugins {
99

1010
evaluationDependsOn(":kotlinx-collections-immutable")
1111

12-
val JDK_6: String by project
13-
1412
kotlin {
1513
infra {
1614
target("macosX64")
@@ -21,8 +19,7 @@ kotlin {
2119
jvm {
2220
compilations.all {
2321
kotlinOptions {
24-
jvmTarget = "1.6"
25-
jdkHome = JDK_6
22+
jvmTarget = "1.8"
2623
}
2724
}
2825
}

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ infra {
2020
}
2121
}
2222

23-
val JDK_6 by ext(System.getenv("JDK_6") ?: findProperty("JDK_6") as String? ?: error("Specify path to JDK 6 in JDK_6 environment variable or Gradle property"))
24-
2523
allprojects {
2624
repositories {
2725
mavenCentral()

core/build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ mavenPublicationsPom {
1313
description.set("Kotlin Immutable Collections multiplatform library")
1414
}
1515

16-
val JDK_6: String by project
17-
1816
kotlin {
1917
infra {
2018
target("macosX64")
@@ -28,8 +26,7 @@ kotlin {
2826
jvm {
2927
compilations.all {
3028
kotlinOptions {
31-
jvmTarget = "1.6"
32-
jdkHome = JDK_6
29+
jvmTarget = "1.8"
3330
}
3431
}
3532
}
@@ -111,6 +108,5 @@ kotlin {
111108
tasks {
112109
named("jvmTest", Test::class) {
113110
maxHeapSize = "1024m"
114-
executable = "$JDK_6/bin/java"
115111
}
116112
}

0 commit comments

Comments
 (0)