Skip to content

Commit

Permalink
fix gradle warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@vincentlauvlwj
vincentlauvlwj committed Jan 19, 2025
1 parent 2f4df7a commit 9c6e5b6
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 98 deletions.
16 changes: 5 additions & 11 deletions buildSrc/src/main/kotlin/ktorm.base.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,18 @@ tasks {
compileKotlin {
dependsOn(codegen)

kotlinOptions {
jvmTarget = "1.8"
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
allWarningsAsErrors = true
freeCompilerArgs = listOf("-Xexplicit-api=strict")
}
}

compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}

jacocoTestReport {
reports {
csv.required.set(true)
xml.required.set(true)
html.required.set(true)
csv.required = true
xml.required = true
html.required = true
}
}
}
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/ktorm.dokka.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ subprojects {
dependsOn("codegen")

dokkaSourceSets.named("main") {
suppressGeneratedFiles.set(false)
suppressGeneratedFiles = false
}
}

Expand All @@ -34,11 +34,11 @@ subprojects {
}

dokkaSourceSets.named("main") {
suppressGeneratedFiles.set(false)
suppressGeneratedFiles = false
sourceLink {
localDirectory.set(file("src/main/kotlin"))
remoteUrl.set(java.net.URL("https://github.com/kotlin-orm/ktorm/blob/master/${project.name}/src/main/kotlin"))
remoteLineSuffix.set("#L")
localDirectory = file("src/main/kotlin")
remoteUrl = uri("https://github.com/kotlin-orm/ktorm/blob/master/${project.name}/src/main/kotlin").toURL()
remoteLineSuffix = "#L"
}
}
}
Expand Down
162 changes: 81 additions & 81 deletions buildSrc/src/main/kotlin/ktorm.publish.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ plugins {
val jarSources by tasks.registering(Jar::class) {
dependsOn("codegen")
from(sourceSets.main.map { it.allSource })
archiveClassifier.set("sources")
archiveClassifier = "sources"
}

val jarJavadoc by tasks.registering(Jar::class) {
dependsOn(tasks.dokkaJavadoc)
from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
archiveClassifier.set("javadoc")
archiveClassifier = "javadoc"
}

publishing {
Expand All @@ -30,139 +30,139 @@ publishing {
version = project.version.toString()

pom {
name.set("${project.group}:${project.name}")
description.set("A lightweight ORM Framework for Kotlin with strong typed SQL DSL and sequence APIs.")
url.set("https://www.ktorm.org")
name = "${project.group}:${project.name}"
description = "A lightweight ORM Framework for Kotlin with strong typed SQL DSL and sequence APIs."
url = "https://www.ktorm.org"
licenses {
license {
name.set("The Apache Software License, Version 2.0")
url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
name = "The Apache Software License, Version 2.0"
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
}
}
scm {
url.set("https://github.com/kotlin-orm/ktorm")
connection.set("scm:git:https://github.com/kotlin-orm/ktorm.git")
developerConnection.set("scm:git:ssh://[email protected]/kotlin-orm/ktorm.git")
url = "https://github.com/kotlin-orm/ktorm"
connection = "scm:git:https://github.com/kotlin-orm/ktorm.git"
developerConnection = "scm:git:ssh://[email protected]/kotlin-orm/ktorm.git"
}
developers {
developer {
id.set("vincentlauvlwj")
name.set("vince")
email.set("[email protected]")
id = "vincentlauvlwj"
name = "vince"
email = "[email protected]"
}
developer {
id.set("waluo")
name.set("waluo")
email.set("[email protected]")
id = "waluo"
name = "waluo"
email = "[email protected]"
}
developer {
id.set("clydebarrow")
name.set("Clyde")
email.set("[email protected]")
id = "clydebarrow"
name = "Clyde"
email = "[email protected]"
}
developer {
id.set("Ray-Eldath")
name.set("Ray Eldath")
email.set("[email protected]")
id = "Ray-Eldath"
name = "Ray Eldath"
email = "[email protected]"
}
developer {
id.set("hangingman")
name.set("hiroyuki.nagata")
email.set("[email protected]")
id = "hangingman"
name = "hiroyuki.nagata"
email = "[email protected]"
}
developer {
id.set("onXoot")
name.set("beetlerx")
email.set("[email protected]")
id = "onXoot"
name = "beetlerx"
email = "[email protected]"
}
developer {
id.set("arustleund")
name.set("Andrew Rustleund")
email.set("[email protected]")
id = "arustleund"
name = "Andrew Rustleund"
email = "[email protected]"
}
developer {
id.set("afezeria")
name.set("afezeria")
email.set("[email protected]")
id = "afezeria"
name = "afezeria"
email = "[email protected]"
}
developer {
id.set("scorsi")
name.set("Sylvain Corsini")
email.set("[email protected]")
id = "scorsi"
name = "Sylvain Corsini"
email = "[email protected]"
}
developer {
id.set("lyndsysimon")
name.set("Lyndsy Simon")
email.set("[email protected]")
id = "lyndsysimon"
name = "Lyndsy Simon"
email = "[email protected]"
}
developer {
id.set("antonydenyer")
name.set("Antony Denyer")
email.set("[email protected]")
id = "antonydenyer"
name = "Antony Denyer"
email = "[email protected]"
}
developer {
id.set("mik629")
name.set("Mikhail Erkhov")
email.set("[email protected]")
id = "mik629"
name = "Mikhail Erkhov"
email = "[email protected]"
}
developer {
id.set("sinzed")
name.set("Saeed Zahedi")
email.set("[email protected]")
id = "sinzed"
name = "Saeed Zahedi"
email = "[email protected]"
}
developer {
id.set("smn-dv")
name.set("Simon Schoof")
email.set("[email protected]")
id = "smn-dv"
name = "Simon Schoof"
email = "[email protected]"
}
developer {
id.set("pedrod")
name.set("Pedro Domingues")
email.set("[email protected]")
id = "pedrod"
name = "Pedro Domingues"
email = "[email protected]"
}
developer {
id.set("efenderbosch")
name.set("Eric Fenderbosch")
email.set("[email protected]")
id = "efenderbosch"
name = "Eric Fenderbosch"
email = "[email protected]"
}
developer {
id.set("kocproz")
name.set("Kacper Stasiuk")
email.set("[email protected]")
id = "kocproz"
name = "Kacper Stasiuk"
email = "[email protected]"
}
developer {
id.set("2938137849")
name.set("ccr")
email.set("[email protected]")
id = "2938137849"
name = "ccr"
email = "[email protected]"
}
developer {
id.set("zuisong")
name.set("zuisong")
email.set("[email protected]")
id = "zuisong"
name = "zuisong"
email = "[email protected]"
}
developer {
id.set("svenallers")
name.set("Sven Allers")
email.set("[email protected]")
id = "svenallers"
name = "Sven Allers"
email = "[email protected]"
}
developer {
id.set("lookup-cat")
name.set("夜里的向日葵")
email.set("[email protected]")
id = "lookup-cat"
name = "夜里的向日葵"
email = "[email protected]"
}
developer {
id.set("michaelfyc")
name.set("michaelfyc")
email.set("[email protected]")
id = "michaelfyc"
name = "michaelfyc"
email = "[email protected]"
}
developer {
id.set("brohacz")
name.set("Michal Brosig")
id = "brohacz"
name = "Michal Brosig"
}
developer {
id.set("hc224")
name.set("hc224")
email.set("[email protected]")
id = "hc224"
name = "hc224"
email = "[email protected]"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ktorm-core/ktorm-core.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ val testOutput by configurations.creating {
val testJar by tasks.registering(Jar::class) {
dependsOn(tasks.testClasses)
from(sourceSets.test.map { it.output })
archiveClassifier.set("test")
archiveClassifier = "test"
}

artifacts {
Expand Down

0 comments on commit 9c6e5b6

Please sign in to comment.