Skip to content

Commit 976f589

Browse files
authored
Finish Kotlin migration (#1012)
This reverts parts of 02f40fd
1 parent 4397a27 commit 976f589

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+17
-78
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ indent_style = space
77
insert_final_newline = true
88
trim_trailing_whitespace = true
99

10-
[*.{groovy,java}]
11-
indent_size = 4
12-
1310
[*.{kt,kts}]
1411
ij_kotlin_imports_layout = *
1512
ij_kotlin_allow_trailing_comma = true

api/build.gradle.kts

Lines changed: 0 additions & 48 deletions
This file was deleted.

build-logic/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ repositories {
1010
dependencies {
1111
implementation("com.gradle.publish:plugin-publish-plugin:1.3.0")
1212
implementation("com.vanniktech:gradle-maven-publish-plugin:0.30.0")
13+
implementation("org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:1.9.20")
1314
implementation("org.ajoberstar.git-publish:gradle-git-publish:4.2.2")
1415
implementation("com.github.node-gradle:gradle-node-plugin:7.1.0")
1516
}

build-logic/src/main/kotlin/shadow.convention.deploy.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gitPublish {
1111
contents {
1212
from("build/site")
1313
into("api") {
14-
from(tasks.named("groovydoc"))
14+
from(tasks.named("dokkaHtml"))
1515
}
1616
filter<ReplaceTokens>(
1717
"tokens" to mapOf(
@@ -33,5 +33,5 @@ val yarnBuild = tasks.named("yarn_build") {
3333
}
3434

3535
tasks.gitPublishCopy {
36-
dependsOn(yarnBuild, tasks.named("groovydoc"))
36+
dependsOn(yarnBuild, tasks.named("dokkaHtml"))
3737
}

build-logic/src/main/kotlin/shadow.convention.publish.gradle.kts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.gradle.plugin-publish")
33
id("com.vanniktech.maven.publish")
4+
id("org.jetbrains.dokka")
45
}
56

67
version = providers.gradleProperty("VERSION_NAME").get()
@@ -36,16 +37,6 @@ tasks.publishPlugins {
3637
notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283")
3738
}
3839

39-
tasks.withType<Javadoc>().configureEach {
40-
(options as? StandardJavadocDocletOptions)?.let {
41-
it.links(
42-
"https://docs.oracle.com/en/java/javase/17/docs/api/",
43-
"https://docs.groovy-lang.org/2.4.7/html/gapi/",
44-
)
45-
it.addStringOption("Xdoclint:none", "-quiet")
46-
}
47-
}
48-
4940
configurations {
5041
listOf(
5142
apiElements,

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
33

44
plugins {
55
kotlin("jvm") version "2.0.21"
6-
groovy
7-
`java-gradle-plugin`
6+
groovy // Required for Spock tests.
87
id("shadow.convention.publish")
98
id("shadow.convention.deploy")
109
id("com.diffplug.spotless") version "7.0.0.BETA4"
@@ -16,6 +15,7 @@ java {
1615
}
1716

1817
kotlin {
18+
explicitApi()
1919
compilerOptions {
2020
// https://docs.gradle.org/current/userguide/compatibility.html#kotlin
2121
apiVersion = KotlinVersion.KOTLIN_1_8
@@ -27,6 +27,9 @@ kotlin {
2727
}
2828

2929
spotless {
30+
kotlin {
31+
ktlint()
32+
}
3033
kotlinGradle {
3134
ktlint()
3235
target("**/*.kts")
@@ -35,9 +38,6 @@ spotless {
3538
}
3639

3740
dependencies {
38-
compileOnly(localGroovy())
39-
implementation(projects.api)
40-
4141
implementation("org.jdom:jdom2:2.0.6.1")
4242
implementation("org.ow2.asm:asm-commons:9.7.1")
4343
implementation("commons-io:commons-io:2.18.0")

settings.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,3 @@ dependencyResolutionManagement {
3030
rootProject.name = "shadow"
3131

3232
enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
33-
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
34-
35-
include(":api")

src/docs/changes/README.md

Lines changed: 4 additions & 0 deletions
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)