Skip to content

Commit

Permalink
Bump build plugins and dependencies (#42)
Browse files Browse the repository at this point in the history
  • Loading branch information
nedtwigg authored Dec 12, 2023
2 parents 5193725 + 1b96afb commit 2b5e4ff
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 25 deletions.
9 changes: 6 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
license=apache
git_url=github.com/diffplug/selfie
maven_group=com.diffplug.selfie
javadoc_links=

ver_JUNIT_API=5.0.0
ver_JUNIT_USE=5.10.0
ver_JUNIT_PIONEER=2.0.1
ver_OKIO=3.5.0
ver_JUNIT_USE=5.10.1
ver_JUNIT_PIONEER=2.1.0
ver_OKIO=3.6.0
ver_KOTLIN_TEST=1.9.10
ver_KOTEST=5.6.2
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
12 changes: 11 additions & 1 deletion selfie-lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
plugins {
id 'org.jetbrains.kotlin.multiplatform'
id 'maven-publish'
}

repositories {
mavenCentral()
}
ext {
maven_name = 'selfie-lib'
maven_desc = 'Core logic and parsing for Selfie'
}

apply from: rootProject.file('gradle/spotless.gradle')
kotlin {
jvm {
Expand All @@ -30,4 +36,8 @@ kotlin {
// the normal `test` task doesn't work for multiplatform projects
tasks.create('test') {
dependsOn('jvmTest')
}
}

// it all needs to get published and formatted
apply from: 干.file('base/maven.gradle')
apply from: 干.file('base/sonatype.gradle')
20 changes: 18 additions & 2 deletions selfie-runner-junit5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,37 @@ plugins {
repositories {
mavenCentral()
}
ext {
maven_name = 'selfie-runner-junit5'
maven_desc = 'JUnit 5 test runner for Selfie'
}

apply from: rootProject.file('gradle/spotless.gradle')
apply plugin: 'java-library'
dependencies {
api project(':selfie-lib')
// see if we can drop this down to 1.0.0
implementation 'org.junit.platform:junit-platform-launcher:1.10.0'
implementation 'org.junit.platform:junit-platform-launcher:1.10.1'
compileOnly "org.junit.jupiter:junit-jupiter-api:$ver_JUNIT_API"
// jsoup
compileOnly 'org.jsoup:jsoup:1.17.1'
testImplementation 'org.jsoup:jsoup:1.17.1'
// flexmark
compileOnly 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
testImplementation 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'

testImplementation "com.squareup.okio:okio:$ver_OKIO"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:$ver_KOTLIN_TEST"
testImplementation "io.kotest:kotest-assertions-core:$ver_KOTEST"
testImplementation "org.junit.jupiter:junit-jupiter:$ver_JUNIT_USE"
testImplementation "org.junit-pioneer:junit-pioneer:$ver_JUNIT_PIONEER"

testImplementation gradleTestKit()
}
test {
useJUnitPlatform()
}
}

// it all needs to get published and formatted
apply from: 干.file('base/maven.gradle')
apply from: 干.file('base/sonatype.gradle')
29 changes: 12 additions & 17 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,36 @@ pluginManagement {
}
plugins {
// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
id 'com.diffplug.blowdryerSetup' version '1.7.0'
id 'com.diffplug.blowdryerSetup' version '1.7.1'
// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
id 'com.diffplug.spotless' version '6.19.0' apply false
id 'com.diffplug.spotless' version '6.23.3' apply false
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
id 'com.gradle.plugin-publish' version '1.2.0' apply false
id 'com.gradle.plugin-publish' version '1.2.1' apply false
// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
id 'dev.equo.ide' version '1.3.0' apply false
id 'dev.equo.ide' version '1.7.5' apply false
// https://github.com/gradle-nexus/publish-plugin/releases
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false
// https://plugins.gradle.org/plugin/org.jetbrains.dokka
id 'org.jetbrains.dokka' version '1.9.10' apply false
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
id 'org.jetbrains.kotlin.jvm' version '1.9.10' apply false
id 'org.jetbrains.kotlin.jvm' version '1.9.21' apply false
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.plugin.serialization
id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.10' apply false
id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.21' apply false
// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform
id 'org.jetbrains.kotlin.multiplatform' version '1.9.10' apply false
id 'org.jetbrains.kotlin.multiplatform' version '1.9.21' apply false
// https://github.com/adamko-dev/dokkatoo/releases
id 'dev.adamko.dokkatoo-html' version '2.0.0' apply false
}

blowdryerSetup {
github 'diffplug/blowdryer-diffplug', 'tag', '7.1.0'
github 'diffplug/blowdryer-diffplug', 'tag', '7.1.1'
//devLocal '../blowdryer-diffplug'
setPluginsBlockTo {
it.file 'plugin.versions'
it.file 'plugin-kotlin.versions'
it.add "\t// https://plugins.gradle.org/plugin/org.jetbrains.kotlin.multiplatform"
it.add "\tid 'org.jetbrains.kotlin.multiplatform' version '1.8.22' apply false"
it.replace '1.8.22', '1.9.10'
it.add "\t// https://github.com/adamko-dev/dokkatoo/releases"
it.add "\tid 'dev.adamko.dokkatoo-html' version '2.0.0' apply false"
it.remove '\t// https://plugins.gradle.org/plugin/org.jetbrains.dokka'
it.remove "\tid 'org.jetbrains.dokka' version '1.8.20' apply false"
it.replace '\t', ' '
it.replace('\t', ' ')
}
}

Expand Down

0 comments on commit 2b5e4ff

Please sign in to comment.