Skip to content

Commit 4b2cda1

Browse files
authored
Rename symbol to disambiguate (#96)
* Rename symbol to disambiguate * apiDump
1 parent a304cd7 commit 4b2cda1

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

  • librarian-cli/src/main/kotlin/com/gradleup/librarian/cli/command
  • librarian-core
  • librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle

librarian-cli/src/main/kotlin/com/gradleup/librarian/cli/command/Create.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.gradleup.librarian.core.tooling.init.initLibrarian
1919
import com.gradleup.librarian.core.tooling.init.initLicense
2020
import com.gradleup.librarian.core.tooling.init.initProject
2121
import com.gradleup.librarian.core.tooling.init.initWriterside
22-
import com.gradleup.librarian.core.tooling.init.kotlinPluginVersion
22+
import com.gradleup.librarian.core.tooling.init.librarianKotlinPluginVersion
2323
import com.gradleup.librarian.core.tooling.init.snapshotsBrowseUrl
2424
import com.gradleup.librarian.core.tooling.init.toSupportedLicense
2525
import com.gradleup.librarian.core.tooling.runCommand
@@ -68,7 +68,7 @@ internal class Create : CliktCommand() {
6868
val pomDeveloper = KInquirer.promptInput("Maven pom developer", copyrightHolder)
6969
val multiplatform = KInquirer.promptConfirm("Kotlin multiplatform project")
7070
val javaCompatibility = KInquirer.promptInput("Java compatibility", "8")
71-
val kotlinCompatibility = KInquirer.promptInput("Kotlin compatibility", kotlinPluginVersion)
71+
val kotlinCompatibility = KInquirer.promptInput("Kotlin compatibility", librarianKotlinPluginVersion)
7272
val indent = KInquirer.promptInput("Indent size", "4")
7373

7474
val repository = GitHubRepository(gitHubProjectOwner, gitHubProjectName)

librarian-cli/src/main/kotlin/com/gradleup/librarian/cli/command/Init.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.gradleup.librarian.core.tooling.init.initChangelog
2424
import com.gradleup.librarian.core.tooling.init.initLibrarian
2525
import com.gradleup.librarian.core.tooling.init.initLicense
2626
import com.gradleup.librarian.core.tooling.init.initWriterside
27-
import com.gradleup.librarian.core.tooling.init.kotlinPluginVersion
27+
import com.gradleup.librarian.core.tooling.init.librarianKotlinPluginVersion
2828
import com.gradleup.librarian.core.tooling.init.toSupportedLicense
2929
import com.gradleup.librarian.core.tooling.gitHubRepositoryOrNull
3030
import java.nio.file.Files
@@ -97,7 +97,7 @@ internal class Init : CliktCommand(invokeWithoutSubcommand = true) {
9797
val pomDeveloper = KInquirer.promptInput("Maven pom developer", defaultDevelopers)
9898
val projectUrl = gitHubRepository?.url() ?: KInquirer.promptInput("Maven pom project url")
9999
val javaCompatibility = KInquirer.promptInput("Java compatibility", "8")
100-
val kotlinCompatibility = KInquirer.promptInput("Kotlin compatibility", kotlinPluginVersion)
100+
val kotlinCompatibility = KInquirer.promptInput("Kotlin compatibility", librarianKotlinPluginVersion)
101101

102102
initLibrarian(
103103
javaCompatibility = javaCompatibility,

librarian-core/api/librarian-core.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public final class com/gradleup/librarian/core/tooling/init/MetadataKt {
163163
}
164164

165165
public final class com/gradleup/librarian/core/tooling/init/ProjectKt {
166-
public static final fun getKotlinPluginVersion ()Ljava/lang/String;
166+
public static final fun getLibrarianKotlinPluginVersion ()Ljava/lang/String;
167167
public static final fun initProject (Ljava/nio/file/Path;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/gradleup/librarian/core/tooling/GitHubRepository;Z)V
168168
public static final fun writeBinaryTo ([BLjava/nio/file/Path;)V
169169
}

librarian-core/src/main/kotlin/com/gradleup/librarian/core/tooling/init/project.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlin.io.path.createDirectory
1111
import kotlin.io.path.writeBytes
1212
import kotlin.io.path.writeText
1313

14-
val kotlinPluginVersion = "2.0.21"
14+
val librarianKotlinPluginVersion = "2.0.21"
1515

1616
fun Path.initProject(
1717
multiplatform: Boolean,
@@ -30,7 +30,7 @@ fun Path.initProject(
3030
[libraries]
3131
3232
[plugins]
33-
kgp = { id = "org.jetbrains.kotlin.jvm", version = "$kotlinPluginVersion" }
33+
kgp = { id = "org.jetbrains.kotlin.jvm", version = "$librarianKotlinPluginVersion" }
3434
librarian = { id = "com.gradleup.librarian", version = "$VERSION" }
3535
""".trimIndent())
3636

librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/bcv.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gradleup.librarian.gradle
22

3-
import com.gradleup.librarian.core.tooling.init.kotlinPluginVersion
3+
import com.gradleup.librarian.core.tooling.init.librarianKotlinPluginVersion
44
import org.gradle.api.Project
55
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
66
import org.jetbrains.kotlin.gradle.dsl.abi.AbiValidationExtension
@@ -25,7 +25,7 @@ internal fun Project.configureBcv(properties: Properties?) {
2525
}
2626
} else {
2727
if (properties != null && properties.get("bcv.warn") != "false") {
28-
println("Librarian: BCV is only configured by default if using KGP 2.2+ (currently detected is '$kotlinPluginVersion'). Set bcv.warn=false in your librarian.root.properties file to remove this warning.")
28+
println("Librarian: BCV is only configured by default if using KGP 2.2+ (currently detected is '$librarianKotlinPluginVersion'). Set bcv.warn=false in your librarian.root.properties file to remove this warning.")
2929
}
3030
}
3131
}

0 commit comments

Comments
 (0)