Skip to content

Commit

Permalink
fix(deps): update dependency org.jlleitschuh.gradle:ktlint-gradle to …
Browse files Browse the repository at this point in the history
…v12 (#668)

* fix(deps): update dependency org.jlleitschuh.gradle:ktlint-gradle to v12

* break long lines

* move comment

* editorconfig

* run ktlint

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Gabriel Ittner <gabriel.ittner@gmail.com>
  • Loading branch information
renovate[bot] and gabrielittner committed Dec 19, 2023
1 parent 7d3972c commit b308d56
Show file tree
Hide file tree
Showing 21 changed files with 177 additions and 78 deletions.
12 changes: 11 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,14 @@ insert_final_newline = true
ij_kotlin_imports_layout=*

ij_kotlin_allow_trailing_comma = true
ij_kotlin_allow_trailing_comma_on_call_site = true
ij_kotlin_allow_trailing_comma_on_call_site = true

# makes constructor annotations indent the whole class
ktlint_standard_annotation = disabled
# too aggressive in wrapping and indenting the expression in an assignment
ktlint_standard_multiline-expression-wrapping = disabled
# depends on the previous one
ktlint_standard_string-template-indent = disabled
# make ktlint less eager to wrap function signatures and expression bodies
ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 4
ktlint_function_signature_body_expression_wrapping=default
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ truth = "1.1.5"
okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"
android-plugin = "com.android.tools.build:gradle:8.2.0"
ktlint-plugin = "org.jlleitschuh.gradle:ktlint-gradle:11.6.1"
ktlint-plugin = "org.jlleitschuh.gradle:ktlint-gradle:12.0.3"
maven-publish-plugin = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
buildconfig-plugin = "com.github.gmazzo:gradle-buildconfig-plugin:3.1.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import retrofit2.http.Path
* -Nexus CORE API: https://repository.sonatype.org/nexus-restlet1x-plugin/default/docs/index.html
*/
internal interface NexusService {

@GET("staging/profiles")
fun getStagingProfiles(): Call<StagingProfilesResponse>

Expand All @@ -25,17 +24,27 @@ internal interface NexusService {
fun getProfileRepositories(): Call<ProfileRepositoriesResponse>

@GET("staging/repository/{repositoryId}")
fun getRepository(@Path("repositoryId") repositoryId: String): Call<Repository>
fun getRepository(
@Path("repositoryId") repositoryId: String,
): Call<Repository>

@GET("staging/repository/{repositoryId}/activity")
fun getRepositoryActivity(@Path("repositoryId") repositoryId: String): Call<List<RepositoryActivity>>
fun getRepositoryActivity(
@Path("repositoryId") repositoryId: String,
): Call<List<RepositoryActivity>>

@POST("staging/bulk/close")
fun closeRepository(@Body input: TransitionRepositoryInput): Call<Unit>
fun closeRepository(
@Body input: TransitionRepositoryInput,
): Call<Unit>

@POST("staging/bulk/promote")
fun releaseRepository(@Body input: TransitionRepositoryInput): Call<Unit>
fun releaseRepository(
@Body input: TransitionRepositoryInput,
): Call<Unit>

@POST("staging/bulk/drop")
fun dropRepository(@Body input: TransitionRepositoryInput): Call<Unit>
fun dropRepository(
@Body input: TransitionRepositoryInput,
): Call<Unit>
}
6 changes: 4 additions & 2 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ gradlePlugin {
id = "com.vanniktech.maven.publish"
implementationClass = "com.vanniktech.maven.publish.MavenPublishPlugin"
displayName = "Gradle Maven Publish Plugin"
description = "Gradle plugin that configures publish tasks to automatically upload all of your Java, Kotlin, Gradle, or Android libraries to any Maven instance."
description = "Gradle plugin that configures publish tasks to automatically upload all of your Java, Kotlin, " +
"Gradle, or Android libraries to any Maven instance."
}
create("mavenPublishBasePlugin") {
id = "com.vanniktech.maven.publish.base"
implementationClass = "com.vanniktech.maven.publish.MavenPublishBasePlugin"
displayName = "Gradle Maven Publish Base Plugin"
description = "Gradle plugin that configures publish tasks to automatically upload all of your Java, Kotlin, Gradle, or Android libraries to any Maven instance."
description = "Gradle plugin that configures publish tasks to automatically upload all of your Java, Kotlin, " +
"Gradle, or Android libraries to any Maven instance."
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ class MavenPublishPluginPlatformTest {
}

@TestParameterInjectorTest
fun javaGradlePluginWithPluginPublishProject(@TestParameter gradlePluginPublish: GradlePluginPublish) {
fun javaGradlePluginWithPluginPublishProject(
@TestParameter gradlePluginPublish: GradlePluginPublish,
) {
val project = javaGradlePluginWithGradlePluginPublish(gradlePluginPublish)
val result = project.run(fixtures, testProjectDir, testOptions)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,23 @@ data class PomDependency(
val optional: Boolean? = null,
)

fun kotlinStdlibCommon(version: KotlinVersion) = PomDependency("org.jetbrains.kotlin", version.commonStdlibArtifactId, version.value, "compile")
fun kotlinStdlibCommon(version: KotlinVersion) = PomDependency(
"org.jetbrains.kotlin",
version.commonStdlibArtifactId,
version.value,
"compile",
)

private val KotlinVersion.commonStdlibArtifactId
get() = if (this < KotlinVersion.KT_1_9_20) "kotlin-stdlib-common" else "kotlin-stdlib"

fun kotlinStdlibJdk(version: KotlinVersion) = PomDependency("org.jetbrains.kotlin", version.jdkStdlibArtifactId, version.value, "compile")

private val KotlinVersion.jdkStdlibArtifactId
get() = if (this < KotlinVersion.KT_1_9_20) "kotlin-stdlib-jdk8" else "kotlin-stdlib"

fun kotlinStdlibJs(version: KotlinVersion) = PomDependency("org.jetbrains.kotlin", version.jsStdlibArtifactId, version.value, "compile")

private val KotlinVersion.jsStdlibArtifactId
get() = if (this < KotlinVersion.KT_1_9_20) "kotlin-stdlib-js" else "kotlin-stdlib"

Expand Down
Loading

0 comments on commit b308d56

Please sign in to comment.