Skip to content

Commit 2b5e4ff

Browse files
authored
Bump build plugins and dependencies (#42)
2 parents 5193725 + 1b96afb commit 2b5e4ff

File tree

7 files changed

+50
-25
lines changed

7 files changed

+50
-25
lines changed

gradle.properties

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
license=apache
2+
git_url=github.com/diffplug/selfie
3+
maven_group=com.diffplug.selfie
4+
javadoc_links=
25

36
ver_JUNIT_API=5.0.0
4-
ver_JUNIT_USE=5.10.0
5-
ver_JUNIT_PIONEER=2.0.1
6-
ver_OKIO=3.5.0
7+
ver_JUNIT_USE=5.10.1
8+
ver_JUNIT_PIONEER=2.1.0
9+
ver_OKIO=3.6.0
710
ver_KOTLIN_TEST=1.9.10
811
ver_KOTEST=5.6.2

gradle/wrapper/gradle-wrapper.jar

346 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum

selfie-lib/build.gradle

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
plugins {
22
id 'org.jetbrains.kotlin.multiplatform'
3+
id 'maven-publish'
34
}
45

56
repositories {
67
mavenCentral()
78
}
9+
ext {
10+
maven_name = 'selfie-lib'
11+
maven_desc = 'Core logic and parsing for Selfie'
12+
}
13+
814
apply from: rootProject.file('gradle/spotless.gradle')
915
kotlin {
1016
jvm {
@@ -30,4 +36,8 @@ kotlin {
3036
// the normal `test` task doesn't work for multiplatform projects
3137
tasks.create('test') {
3238
dependsOn('jvmTest')
33-
}
39+
}
40+
41+
// it all needs to get published and formatted
42+
apply from: 干.file('base/maven.gradle')
43+
apply from: 干.file('base/sonatype.gradle')

selfie-runner-junit5/build.gradle

+18-2
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,37 @@ plugins {
44
repositories {
55
mavenCentral()
66
}
7+
ext {
8+
maven_name = 'selfie-runner-junit5'
9+
maven_desc = 'JUnit 5 test runner for Selfie'
10+
}
11+
712
apply from: rootProject.file('gradle/spotless.gradle')
813
apply plugin: 'java-library'
914
dependencies {
1015
api project(':selfie-lib')
1116
// see if we can drop this down to 1.0.0
12-
implementation 'org.junit.platform:junit-platform-launcher:1.10.0'
17+
implementation 'org.junit.platform:junit-platform-launcher:1.10.1'
1318
compileOnly "org.junit.jupiter:junit-jupiter-api:$ver_JUNIT_API"
19+
// jsoup
20+
compileOnly 'org.jsoup:jsoup:1.17.1'
21+
testImplementation 'org.jsoup:jsoup:1.17.1'
22+
// flexmark
23+
compileOnly 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
24+
testImplementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
1425

1526
testImplementation "com.squareup.okio:okio:$ver_OKIO"
1627
testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:$ver_KOTLIN_TEST"
1728
testImplementation "io.kotest:kotest-assertions-core:$ver_KOTEST"
1829
testImplementation "org.junit.jupiter:junit-jupiter:$ver_JUNIT_USE"
1930
testImplementation "org.junit-pioneer:junit-pioneer:$ver_JUNIT_PIONEER"
31+
2032
testImplementation gradleTestKit()
2133
}
2234
test {
2335
useJUnitPlatform()
24-
}
36+
}
37+
38+
// it all needs to get published and formatted
39+
apply from: 干.file('base/maven.gradle')
40+
apply from: 干.file('base/sonatype.gradle')

settings.gradle

+12-17
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,36 @@ pluginManagement {
66
}
77
plugins {
88
// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
9-
id 'com.diffplug.blowdryerSetup' version '1.7.0'
9+
id 'com.diffplug.blowdryerSetup' version '1.7.1'
1010
// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
11-
id 'com.diffplug.spotless' version '6.19.0' apply false
11+
id 'com.diffplug.spotless' version '6.23.3' apply false
1212
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
1313
id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
1414
// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
15-
id 'com.gradle.plugin-publish' version '1.2.0' apply false
15+
id 'com.gradle.plugin-publish' version '1.2.1' apply false
1616
// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
17-
id 'dev.equo.ide' version '1.3.0' apply false
17+
id 'dev.equo.ide' version '1.7.5' apply false
1818
// https://github.com/gradle-nexus/publish-plugin/releases
19-
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
19+
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false
20+
// https://plugins.gradle.org/plugin/org.jetbrains.dokka
21+
id 'org.jetbrains.dokka' version '1.9.10' apply false
2022
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
21-
id 'org.jetbrains.kotlin.jvm' version '1.9.10' apply false
23+
id 'org.jetbrains.kotlin.jvm' version '1.9.21' apply false
2224
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization
23-
id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.10' apply false
25+
id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21' apply false
2426
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform
25-
id 'org.jetbrains.kotlin.multiplatform' version '1.9.10' apply false
27+
id 'org.jetbrains.kotlin.multiplatform' version '1.9.21' apply false
2628
// https://github.com/adamko-dev/dokkatoo/releases
2729
id 'dev.adamko.dokkatoo-html' version '2.0.0' apply false
2830
}
2931

3032
blowdryerSetup {
31-
github 'diffplug/blowdryer-diffplug', 'tag', '7.1.0'
33+
github 'diffplug/blowdryer-diffplug', 'tag', '7.1.1'
3234
//devLocal '../blowdryer-diffplug'
3335
setPluginsBlockTo {
3436
it.file 'plugin.versions'
3537
it.file 'plugin-kotlin.versions'
36-
it.add "\t// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform"
37-
it.add "\tid 'org.jetbrains.kotlin.multiplatform' version '1.8.22' apply false"
38-
it.replace '1.8.22', '1.9.10'
39-
it.add "\t// https://github.com/adamko-dev/dokkatoo/releases"
40-
it.add "\tid 'dev.adamko.dokkatoo-html' version '2.0.0' apply false"
41-
it.remove '\t// https://plugins.gradle.org/plugin/org.jetbrains.dokka'
42-
it.remove "\tid 'org.jetbrains.dokka' version '1.8.20' apply false"
43-
it.replace '\t', ' '
38+
it.replace('\t', ' ')
4439
}
4540
}
4641

0 commit comments

Comments
 (0)