Skip to content

Commit 90b5698

Browse files
committed
chore(gradle): update to gradle 7
Migrate maven to maven-publish
1 parent 517f61e commit 90b5698

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

gradle/build.gradle.kts

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import java.util.concurrent.TimeoutException
77
import java.util.concurrent.atomic.AtomicBoolean
88

99
plugins {
10-
maven
1110
kotlin("jvm") version "1.6.21"
1211
id("org.jetbrains.dokka") version "0.10.1"
1312
id("scripts-task")
1413
id("idea")
14+
`maven-publish`
1515

1616
id("com.github.ben-manes.versions") version "0.42.0" // only upgrade with Gradle 7: https://github.com/ben-manes/gradle-versions-plugin/issues/778
1717
id("se.patrikerdes.use-latest-versions") version "0.2.18"
@@ -285,8 +285,21 @@ allprojects {
285285
}
286286

287287
if (this.name in documentedProjects) {
288-
apply(plugin = "maven")
288+
apply(plugin = "maven-publish")
289289
apply(plugin = "org.jetbrains.dokka")
290+
publishing {
291+
publications {
292+
create<MavenPublication>(name) {
293+
println(components.joinToString())
294+
from(components["java"])
295+
version = rootProject.version.toString()
296+
}
297+
}
298+
}
299+
java {
300+
withSourcesJar()
301+
withJavadocJar()
302+
}
290303
tasks {
291304
val doc by creating(DokkaTask::class) {
292305
group = "documentation"
@@ -300,17 +313,14 @@ allprojects {
300313
archiveBaseName.set(jar.get().archiveBaseName)
301314
archiveClassifier.set("javadoc")
302315
}
303-
val sourcesJar by creating(Jar::class) {
304-
group = "build"
305-
archiveBaseName.set(jar.get().archiveBaseName)
306-
archiveClassifier.set("sources")
307-
from(sourceSets.main.get().allSource)
308-
}
309-
install {
310-
dependsOn(docJar, sourcesJar)
311-
}
316+
//val sourcesJar by creating(Jar::class) {
317+
// group = "build"
318+
// archiveBaseName.set(jar.get().archiveBaseName)
319+
// archiveClassifier.set("sources")
320+
// from(sourceSets.main.get().allSource)
321+
//}
312322
artifacts {
313-
archives(sourcesJar.archiveFile) { classifier = "sources" }
323+
//archives(sourcesJar.archiveFile) { classifier = "sources" }
314324
archives(docJar.archiveFile) { classifier = "javadoc" }
315325
}
316326
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)