Skip to content

Commit eb08cc3

Browse files
martinbonninmartinbonnin
authored
Merge pull request #32 from GradleUp/g/20250422/editorconfig
Add .editorconfig and reformat code
2 parents 9182fdf + 5dfacb3 commit eb08cc3

9 files changed

Lines changed: 86 additions & 51 deletions

File tree

‎.editorconfig‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
indent_size = 2
6+
indent_style = space
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
[*.{kt,kts}]
11+
ij_kotlin_imports_layout = *
12+
ij_kotlin_allow_trailing_comma = true
13+
ij_kotlin_allow_trailing_comma_on_call_site = true
14+
ij_kotlin_line_break_after_multiline_when_entry = false
15+
ij_kotlin_name_count_to_use_star_import = 999
16+
ij_kotlin_name_count_to_use_star_import_for_members = 999
17+
ij_kotlin_packages_to_use_import_on_demand = unset
18+
indent_size = 4
19+
ktlint_code_style = intellij_idea
20+
ktlint_standard_function-expression-body = disabled
21+
22+
[*.md]
23+
trim_trailing_whitespace = false

‎build.gradle.kts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ publishing {
3939
publications.configureEach {
4040
this as MavenPublication
4141
if (name == "pluginMaven") {
42-
artifact(tasks.register("emptySources", Jar::class.java) {
42+
val emptySources by tasks.registering(Jar::class) {
4343
archiveClassifier = "sources"
44-
})
45-
artifact(tasks.register("emptyDocs", Jar::class.java) {
44+
}
45+
val emptyDocs by tasks.registering(Jar::class) {
4646
archiveClassifier = "javadoc"
47-
})
47+
}
48+
artifact(emptySources)
49+
artifact(emptyDocs)
4850

4951
groupId = project.rootProject.group.toString()
5052
version = project.rootProject.version.toString()
@@ -100,4 +102,4 @@ tasks.withType<AbstractPublishToMaven>().configureEach {
100102

101103
tasks.withType(Sign::class.java).configureEach {
102104
isEnabled = System.getenv("GPG_KEY").isNullOrBlank().not()
103-
}
105+
}

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
88
okhttp-logging-interceptor = "com.squareup.okhttp3:logging-interceptor:4.12.0"
99
mockwebserver = "com.squareup.okhttp3:mockwebserver:4.12.0"
1010
[plugins]
11-
kgp = { id = "org.jetbrains.kotlin.jvm", version.ref = "kgp" }
11+
kgp = { id = "org.jetbrains.kotlin.jvm", version.ref = "kgp" }

‎settings.gradle.kts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
pluginManagement {
2-
listOf(repositories, dependencyResolutionManagement.repositories).forEach {
3-
it.apply {
4-
mavenCentral()
2+
listOf(
3+
repositories,
4+
dependencyResolutionManagement.repositories,
5+
).forEach {
6+
it.apply {
7+
mavenCentral()
8+
}
59
}
6-
}
7-
}
10+
}

‎src/main/kotlin/nmcp/NmcpAggregation.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package nmcp
22

3+
import java.time.Duration
4+
import javax.inject.Inject
35
import org.gradle.api.Project
46
import org.gradle.api.artifacts.Configuration
57
import org.gradle.api.provider.Property
6-
import java.time.Duration
7-
import javax.inject.Inject
88

99
abstract class NmcpAggregation @Inject constructor(
1010
private val configuration: Configuration,
1111
private val project: Project,
12-
) {
12+
) {
1313
/**
1414
* The central portal username
1515
*/
@@ -57,6 +57,6 @@ abstract class NmcpAggregation @Inject constructor(
5757
abstract val verificationTimeout: Property<Duration>
5858

5959
fun project(path: String) {
60-
project.dependencies.add(configuration.name, project.dependencies.project(mapOf("path" to path)))
60+
project.dependencies.add(configuration.name, project.dependencies.project(mapOf("path" to path)))
6161
}
62-
}
62+
}

‎src/main/kotlin/nmcp/NmcpExtension.kt‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,10 @@ open class NmcpExtension(private val project: Project) {
6666
it.archiveFileName.set("publication$capitalized.zip")
6767
}
6868

69-
7069
val publishTaskProvider = project.tasks.register("publish${capitalized}PublicationToCentralPortal", NmcpPublishTask::class.java) {
7170
it.inputFile.set(zipTaskProvider.flatMap { it.archiveFile })
72-
it.username.set(spec.username.orElse(project.provider { error("Nmcp: username must not be empty")}))
73-
it.password.set(spec.password.orElse(project.provider { error("Nmcp: password must not be empty")}))
71+
it.username.set(spec.username.orElse(project.provider { error("Nmcp: username must not be empty") }))
72+
it.password.set(spec.password.orElse(project.provider { error("Nmcp: password must not be empty") }))
7473
it.publicationType.set(spec.publicationType)
7574
it.publicationName.set(spec.publicationName.orElse("${project.name}-${project.version}.zip"))
7675
it.endpoint.set(spec.endpoint)
@@ -140,23 +139,25 @@ open class NmcpExtension(private val project: Project) {
140139
action.execute(aggregation)
141140

142141
val zipTaskProvider = project.tasks.register("zipAggregationPublication", Zip::class.java) {
143-
it.from(configuration.elements.map {
144-
check (it.isNotEmpty()) {
145-
"nmcp: no aggregate dependencies found, please apply the 'com.gradleup.nmcp' in your submodules"
146-
}
147-
it.map {
148-
project.zipTree(it)
149-
}
150-
})
142+
it.from(
143+
configuration.elements.map {
144+
check(it.isNotEmpty()) {
145+
"nmcp: no aggregate dependencies found, please apply the 'com.gradleup.nmcp' in your submodules"
146+
}
147+
it.map {
148+
project.zipTree(it)
149+
}
150+
},
151+
)
151152

152153
it.destinationDirectory.set(project.layout.buildDirectory.dir("nmcp/zip"))
153154
it.archiveFileName.set("publicationAggregated.zip")
154155
}
155156

156157
project.tasks.register("publishAggregatedPublicationToCentralPortal", NmcpPublishTask::class.java) {
157158
it.inputFile.set(zipTaskProvider.flatMap { it.archiveFile })
158-
it.username.set(aggregation.username.orElse(project.provider { error("Nmcp: username must not be empty")}))
159-
it.password.set(aggregation.password.orElse(project.provider { error("Nmcp: password must not be empty")}))
159+
it.username.set(aggregation.username.orElse(project.provider { error("Nmcp: username must not be empty") }))
160+
it.password.set(aggregation.password.orElse(project.provider { error("Nmcp: password must not be empty") }))
160161
it.publicationType.set(aggregation.publicationType)
161162
it.publicationName.set(aggregation.publicationName.orElse("${project.name}-${project.version}.zip"))
162163
it.endpoint.set(aggregation.endpoint)
@@ -199,4 +200,4 @@ open class NmcpExtension(private val project: Project) {
199200
}
200201
}
201202
}
202-
}
203+
}

‎src/main/kotlin/nmcp/NmcpPlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal fun HasConfigurableAttributes<*>.configureAttributes(project: Project)
2020
}
2121
}
2222

23-
class NmcpPlugin: Plugin<Project> {
23+
class NmcpPlugin : Plugin<Project> {
2424
override fun apply(target: Project) {
2525
target.configurations.create(configurationName) {
2626
it.isCanBeConsumed = true
@@ -32,4 +32,4 @@ class NmcpPlugin: Plugin<Project> {
3232
}
3333
target.extensions.create("nmcp", NmcpExtension::class.java, target)
3434
}
35-
}
35+
}

‎src/main/kotlin/nmcp/NmcpPublishTask.kt‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package nmcp
22

3+
import java.time.Duration
4+
import kotlin.time.Duration.Companion.minutes
5+
import kotlin.time.TimeSource.Monotonic.markNow
6+
import kotlin.time.toJavaDuration
7+
import kotlin.time.toKotlinDuration
38
import kotlinx.serialization.json.Json
49
import kotlinx.serialization.json.JsonObject
510
import kotlinx.serialization.json.JsonPrimitive
@@ -14,15 +19,13 @@ import okio.ByteString
1419
import org.gradle.api.DefaultTask
1520
import org.gradle.api.file.RegularFileProperty
1621
import org.gradle.api.provider.Property
17-
import org.gradle.api.tasks.*
22+
import org.gradle.api.tasks.Input
23+
import org.gradle.api.tasks.InputFile
24+
import org.gradle.api.tasks.Optional
25+
import org.gradle.api.tasks.PathSensitive
26+
import org.gradle.api.tasks.PathSensitivity
27+
import org.gradle.api.tasks.TaskAction
1828
import org.gradle.work.DisableCachingByDefault
19-
import java.time.Duration
20-
import kotlin.time.Duration.Companion.minutes
21-
import kotlin.time.Duration.Companion.seconds
22-
import kotlin.time.TimeSource.Monotonic.markNow
23-
import kotlin.time.toJavaDuration
24-
import kotlin.time.toKotlinDuration
25-
2629

2730
@DisableCachingByDefault
2831
abstract class NmcpPublishTask : DefaultTask() {
@@ -75,7 +78,7 @@ abstract class NmcpPublishTask : DefaultTask() {
7578
.addFormDataPart(
7679
"bundle",
7780
publicationName.get(),
78-
inputFile.get().asFile.asRequestBody("application/zip".toMediaType())
81+
inputFile.get().asFile.asRequestBody("application/zip".toMediaType()),
7982
)
8083
.build()
8184

@@ -105,17 +108,20 @@ abstract class NmcpPublishTask : DefaultTask() {
105108
val timeout = verificationTimeout.orElse(10.minutes.toJavaDuration()).get()
106109
val mark = markNow()
107110
while (true) {
108-
check (mark.elapsedNow() < timeout.toKotlinDuration()) {
111+
check(mark.elapsedNow() < timeout.toKotlinDuration()) {
109112
"Nmcp: timeout while verifying deployment status."
110113
}
111-
when (val status = verifyStatus(
112-
deploymentId = deploymentId,
113-
endpoint = endpoint,
114-
token = token,
115-
)) {
114+
when (
115+
val status = verifyStatus(
116+
deploymentId = deploymentId,
117+
endpoint = endpoint,
118+
token = token,
119+
)
120+
) {
116121
PENDING,
117122
VALIDATING,
118-
PUBLISHING -> {
123+
PUBLISHING,
124+
-> {
119125
// Come back later
120126
Thread.sleep(2000)
121127
}
@@ -201,4 +207,4 @@ private fun verifyStatus(
201207
else -> error("Nmcp: unexpected status: $state")
202208
}
203209
}
204-
}
210+
}

‎src/main/kotlin/nmcp/NmcpSpec.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package nmcp
22

3-
import org.gradle.api.provider.Property
43
import java.time.Duration
4+
import org.gradle.api.provider.Property
55

66
abstract class NmcpSpec {
77
/**
@@ -49,4 +49,4 @@ abstract class NmcpSpec {
4949
* Default: 600 (10 minutes).
5050
*/
5151
abstract val verificationTimeout: Property<Duration>
52-
}
52+
}

0 commit comments

Comments
 (0)