Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.

Commit aedb485

Browse files
Merge pull request #2 from nurigo/fix/gradle-dependency
Fix JDK 1.8 compatibility issues in Gradle environment
2 parents 421fafd + 561be1c commit aedb485

1 file changed

Lines changed: 16 additions & 27 deletions

File tree

build.gradle.kts

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,31 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4+
kotlin("jvm") version "1.6.21"
5+
kotlin("plugin.serialization") version "1.6.21"
46
`java-library`
5-
kotlin("jvm") version "1.6.0"
6-
kotlin("plugin.serialization") version "1.6.0"
7-
id("org.jetbrains.dokka") version "1.6.0"
87
`maven-publish`
98
signing
109
}
1110

1211
group = "net.nurigo"
13-
version = "4.1.3"
12+
version = "4.1.4"
1413

1514
repositories {
1615
mavenCentral()
1716
}
1817

1918
dependencies {
20-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
21-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
22-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0")
23-
implementation("commons-codec:commons-codec:1.15")
24-
implementation("org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.3.1")
25-
26-
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
27-
28-
implementation("com.squareup.okhttp3:okhttp")
29-
implementation("com.squareup.okhttp3:logging-interceptor")
19+
implementation(kotlin("stdlib-jdk8"))
20+
implementation(kotlin("reflect"))
21+
implementation("org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.3.2")
3022

23+
implementation("commons-codec:commons-codec:1.15")
24+
implementation("com.squareup.okhttp3:okhttp:4.9.3")
25+
implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
3126
implementation("com.squareup.retrofit2:retrofit:2.9.0")
32-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1")
27+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
3328
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0")
34-
35-
dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.0")
36-
dokkaHtmlPlugin("org.jetbrains.dokka:javadoc-plugin:1.6.0")
37-
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.0")
3829
}
3930

4031
java {
@@ -46,18 +37,16 @@ tasks.getByName<Test>("test") {
4637
useJUnitPlatform()
4738
}
4839

40+
tasks.withType<JavaCompile>().configureEach {
41+
javaCompiler.set(javaToolchains.compilerFor {
42+
languageVersion.set(JavaLanguageVersion.of(8))
43+
})
44+
}
45+
4946
val compileKotlin: KotlinCompile by tasks
5047
compileKotlin.kotlinOptions {
5148
jvmTarget = "1.8"
5249
}
53-
val compileTestKotlin: KotlinCompile by tasks
54-
compileTestKotlin.kotlinOptions {
55-
jvmTarget = "1.8"
56-
}
57-
58-
tasks.dokkaHtml.configure {
59-
outputDirectory.set(buildDir.resolve("dokka"))
60-
}
6150

6251
val ossusername: String by project
6352
val osspassword: String by project

0 commit comments

Comments
 (0)