Fluent disk and inline facet assertions

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+* `DiskSelfie.toMatchDisk` now returns `DiskSelfie` so that we can fluently chain inline assertions on facets.
 
 ## [0.1.3] - 2023-12-26
 * Publish `selfie-lib-jvm` *and* `selfie-lib` to Maven Central.

build.gradle

@@ -7,7 +7,7 @@ repositories {
 }
 group = 干.proj('maven_group', 'the maven group, recommend com.diffplug')
 apply from: rootProject.file('gradle/spotless.gradle')
-apply from: rootProject.file('gradle/changelog.gradle')
+apply from: 干.file('base/changelog.gradle')
 apply from: 干.file('base/sonatype.gradle')
 
 // ./gradlew :dokkatooGeneratePublicationHtml

selfie-lib/build.gradle

@@ -11,7 +11,7 @@ ext {
   maven_desc = 'Core logic and parsing for Selfie'
 }
 
-apply from: rootProject.file('gradle/changelog.gradle')
+apply from: 干.file('base/changelog.gradle')
 apply from: rootProject.file('gradle/spotless.gradle')
 kotlin {
   jvm {
@@ -40,5 +40,5 @@ tasks.create('test') {
 }
 
 // it all needs to get published and formatted
-apply from: rootProject.file('gradle/maven.gradle')
+apply from: 干.file('base/maven.gradle')
 apply from: 干.file('base/sonatype.gradle')

selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Selfie.kt

@@ -55,12 +55,12 @@ object Selfie {
 
   class DiskSelfie internal constructor(actual: Snapshot) : LiteralStringSelfie(actual) {
     @JvmOverloads
-    fun toMatchDisk(sub: String = ""): Snapshot {
+    fun toMatchDisk(sub: String = ""): DiskSelfie {
       val comparison = storage.readWriteDisk(actual, sub)
       if (!storage.isWrite) {
         comparison.assertEqual(storage)
       }
-      return comparison.actual
+      return this
     }
   }
 

selfie-runner-junit5/build.gradle

@@ -9,7 +9,7 @@ ext {
   maven_desc = 'JUnit 5 test runner for Selfie'
 }
 
-apply from: rootProject.file('gradle/changelog.gradle')
+apply from: 干.file('base/changelog.gradle')
 apply from: rootProject.file('gradle/spotless.gradle')
 apply plugin: 'java-library'
 dependencies {
@@ -31,5 +31,5 @@ test {
 }
 
 // it all needs to get published and formatted
-apply from: rootProject.file('gradle/maven.gradle')
+apply from: 干.file('base/maven.gradle')
 apply from: 干.file('base/sonatype.gradle')

settings.gradle

@@ -30,7 +30,7 @@ plugins {
 }
 
 blowdryerSetup {
-  github 'diffplug/blowdryer-diffplug', 'tag', '7.1.1'
+  github 'diffplug/blowdryer-diffplug', 'tag', '7.2.0'
   //devLocal '../blowdryer-diffplug'
   setPluginsBlockTo {
     it.file 'plugin.versions'