diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 2c02ce0f..ae1d3c58 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -2,18 +2,19 @@ name: "Validate Gradle Wrapper" on: push: paths: - - 'gradlew' - - 'gradlew.bat' - - 'gradle/wrapper/' + - 'jvm/gradlew' + - 'jvm/gradlew.bat' + - 'jvm/gradle/wrapper/' pull_request: paths: - - 'gradlew' - - 'gradlew.bat' - - 'gradle/wrapper/' - + - 'jvm/gradlew' + - 'jvm/gradlew.bat' + - 'jvm/gradle/wrapper/' permissions: contents: read - +defaults: + run: + working-directory: jvm jobs: validation: name: "Validation" diff --git a/.github/workflows/ci.yml b/.github/workflows/jvm-ci.yml similarity index 94% rename from .github/workflows/ci.yml rename to .github/workflows/jvm-ci.yml index ef748025..cd4cecc6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/jvm-ci.yml @@ -1,7 +1,12 @@ on: - pull_request: push: branches: [main] + pull_request: + paths: + - 'jvm/*' +defaults: + run: + working-directory: jvm concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/deploy.yml b/.github/workflows/jvm-deploy.yml similarity index 97% rename from .github/workflows/deploy.yml rename to .github/workflows/jvm-deploy.yml index 3d95da70..eaa0f1f1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/jvm-deploy.yml @@ -10,7 +10,6 @@ # GRADLE_KEY # GRADLE_SECRET -name: deploy on: workflow_dispatch: inputs: @@ -21,7 +20,9 @@ on: type: choice options: - all - +defaults: + run: + working-directory: jvm jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/publish-kdoc.yml b/.github/workflows/jvm-publish-kdoc.yml similarity index 92% rename from .github/workflows/publish-kdoc.yml rename to .github/workflows/jvm-publish-kdoc.yml index 9f831670..b9bf55fc 100644 --- a/.github/workflows/publish-kdoc.yml +++ b/.github/workflows/jvm-publish-kdoc.yml @@ -1,6 +1,11 @@ on: push: branches: [release] + paths: + - 'jvm/*' +defaults: + run: + working-directory: jvm jobs: publish: runs-on: ubuntu-latest diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 41176343..53df3595 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,22 +1,15 @@ # Contributing to Selfie -- If you want to improve our webpage, [selfie.dev](https://selfie.dev), go to [`docs/README.md`](docs/README.md) -- If you want to remove the webpage of our published kdoc, [kdoc.selfie.dev](https://kdoc.selfie.dev), go to [`gradle/dokka/README.md`](gradle/dokka/README.md) -- If you want to contribute to the Kotlin Multiplatform implementation of selfie (jvm, js, wasm) use the gradle instructions below -- If you want to contribute for a different platform (python, go, etc.) we'd love to help, but it should probably live in a different repo. Discuss in [selfie#85](https://github.com/diffplug/selfie/issues/85), but also feel free to open a PR with any ideas you have. - +- To improve our webpage go to [`selfie.dev/README.md`](selfie.dev/README.md) +- To improve our JVM, Javascript, or WASM implementations, go to [`jvm/README.md`](jvm/README.md) + - To improve the webpage of our published kdoc, [kdoc.selfie.dev](https://kdoc.selfie.dev), go to [`jvm/gradle/dokka/README.md`](jvm/gradle/dokka/README.md) +- To contribute for a different platform (python, go, etc.) we're happy to help! It should probably live in a different repo until it's close to `1.0`, but once it's near completion we're happy to maintain it here if you would like. Discuss in [selfie#85](https://github.com/diffplug/selfie/issues/85), but also feel free to open a PR with any ideas you have. Pull requests are very welcome, preferably against `main`. -## Build instructions - -It's a standard Gradle build, `./gradlew build` to assemble and test everything. - -One tricky thing is that inline snapshots requires changing the code being tested. To make this work, we have `undertest` projects. Their `test` task is disabled, and they have an `underTest` task instead. You'll note that every test in these projects is named `UT_SomethingTest`. That's because there is a corresponding `SomethingTest` in `selfie-runner-junit5` , and `SomethingTest` works by changing the source code in `UT_SomethingTest`, running builds, and making assertions about the state of snapshots and source code after the build. - ## License -By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/diffplug/atplug/blob/master/LICENSE +By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/diffplug/selfie/blob/master/LICENSE All files are released with the Apache 2.0 license as such: diff --git a/README.md b/README.md index 9b8dcbf5..5a9b6439 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Selfie +# Selfie Snapshot testing for the JVM. diff --git a/CHANGELOG.md b/jvm/CHANGELOG.md similarity index 85% rename from CHANGELOG.md rename to jvm/CHANGELOG.md index 093f9b20..e75b7e5f 100644 --- a/CHANGELOG.md +++ b/jvm/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog -All notable changes to this project will be documented in this file. +Changelog for the selfie JVM libraries. + +- [`com.diffplug.selfie:selfie-lib:VERSION`](https://central.sonatype.com/artifact/com.diffplug.selfie/selfie-lib) +- [`com.diffplug.selfie:selfie-runner-junit5:VERSION`](https://central.sonatype.com/artifact/com.diffplug.selfie/selfie-runner-junit5) + - can be used with JUnit4 via [junit-vintage](https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4) 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). diff --git a/jvm/README.md b/jvm/README.md new file mode 100644 index 00000000..a83fee4b --- /dev/null +++ b/jvm/README.md @@ -0,0 +1,11 @@ +# Selfie snapshot testing for Java, Kotlin, and the JVM + +- [Quickstart](https://selfie.dev/jvm/get-started) +- [Advanced](https://selfie.dev/jvm/advanced) +- [Why selfie](https://selfie.dev/jvm) + +## Contributing + +PR's welcome! It's a standard Gradle build, `./gradlew build` to assemble and test everything. + +One tricky thing is that testing inline snapshots requires changing the code being tested. To make this work, we have `undertest` projects. Their `test` task is disabled, and they have an `underTest` task instead. You'll note that every test in these projects is named `UT_SomethingTest`. That's because there is a corresponding `SomethingTest` in `selfie-runner-junit5` , and `SomethingTest` works by changing the source code in `UT_SomethingTest`, running builds, and making assertions about the state of snapshots and source code after the build. diff --git a/build.gradle b/jvm/build.gradle similarity index 93% rename from build.gradle rename to jvm/build.gradle index a919587b..3bf37741 100644 --- a/build.gradle +++ b/jvm/build.gradle @@ -5,6 +5,10 @@ plugins { repositories { mavenCentral() } +spotlessChangelog { + tagPrefix 'jvm/' + commitMessage 'Published jvm/{{version}}' +} group = 干.proj('maven_group', 'the maven group, recommend com.diffplug') apply from: rootProject.file('gradle/spotless.gradle') apply from: 干.file('base/changelog.gradle') diff --git a/example-junit5/README.md b/jvm/example-junit5/README.md similarity index 100% rename from example-junit5/README.md rename to jvm/example-junit5/README.md diff --git a/example-junit5/build.gradle b/jvm/example-junit5/build.gradle similarity index 100% rename from example-junit5/build.gradle rename to jvm/example-junit5/build.gradle diff --git a/example-junit5/src/main/java/com/example/Account.java b/jvm/example-junit5/src/main/java/com/example/Account.java similarity index 100% rename from example-junit5/src/main/java/com/example/Account.java rename to jvm/example-junit5/src/main/java/com/example/Account.java diff --git a/example-junit5/src/main/java/com/example/Email.java b/jvm/example-junit5/src/main/java/com/example/Email.java similarity index 100% rename from example-junit5/src/main/java/com/example/Email.java rename to jvm/example-junit5/src/main/java/com/example/Email.java diff --git a/example-junit5/src/main/java/com/example/Prod.java b/jvm/example-junit5/src/main/java/com/example/Prod.java similarity index 100% rename from example-junit5/src/main/java/com/example/Prod.java rename to jvm/example-junit5/src/main/java/com/example/Prod.java diff --git a/example-junit5/src/main/java/com/example/Time.java b/jvm/example-junit5/src/main/java/com/example/Time.java similarity index 100% rename from example-junit5/src/main/java/com/example/Time.java rename to jvm/example-junit5/src/main/java/com/example/Time.java diff --git a/example-junit5/src/test/java/com/example/AccountTest.java b/jvm/example-junit5/src/test/java/com/example/AccountTest.java similarity index 100% rename from example-junit5/src/test/java/com/example/AccountTest.java rename to jvm/example-junit5/src/test/java/com/example/AccountTest.java diff --git a/example-junit5/src/test/java/com/example/Dev.java b/jvm/example-junit5/src/test/java/com/example/Dev.java similarity index 100% rename from example-junit5/src/test/java/com/example/Dev.java rename to jvm/example-junit5/src/test/java/com/example/Dev.java diff --git a/example-junit5/src/test/java/com/example/DevTime.java b/jvm/example-junit5/src/test/java/com/example/DevTime.java similarity index 100% rename from example-junit5/src/test/java/com/example/DevTime.java rename to jvm/example-junit5/src/test/java/com/example/DevTime.java diff --git a/example-junit5/src/test/java/com/example/EmailDev.java b/jvm/example-junit5/src/test/java/com/example/EmailDev.java similarity index 100% rename from example-junit5/src/test/java/com/example/EmailDev.java rename to jvm/example-junit5/src/test/java/com/example/EmailDev.java diff --git a/example-junit5/src/test/java/com/example/LoginFlowTest.java b/jvm/example-junit5/src/test/java/com/example/LoginFlowTest.java similarity index 100% rename from example-junit5/src/test/java/com/example/LoginFlowTest.java rename to jvm/example-junit5/src/test/java/com/example/LoginFlowTest.java diff --git a/example-junit5/src/test/java/com/example/LoginFlowTest.ss b/jvm/example-junit5/src/test/java/com/example/LoginFlowTest.ss similarity index 100% rename from example-junit5/src/test/java/com/example/LoginFlowTest.ss rename to jvm/example-junit5/src/test/java/com/example/LoginFlowTest.ss diff --git a/example-junit5/src/test/java/com/example/MyRestAssured.java b/jvm/example-junit5/src/test/java/com/example/MyRestAssured.java similarity index 100% rename from example-junit5/src/test/java/com/example/MyRestAssured.java rename to jvm/example-junit5/src/test/java/com/example/MyRestAssured.java diff --git a/example-junit5/src/test/java/com/example/unrelated/LandingPage.java b/jvm/example-junit5/src/test/java/com/example/unrelated/LandingPage.java similarity index 100% rename from example-junit5/src/test/java/com/example/unrelated/LandingPage.java rename to jvm/example-junit5/src/test/java/com/example/unrelated/LandingPage.java diff --git a/example-junit5/src/test/java/selfie/SelfieSettings.java b/jvm/example-junit5/src/test/java/selfie/SelfieSettings.java similarity index 100% rename from example-junit5/src/test/java/selfie/SelfieSettings.java rename to jvm/example-junit5/src/test/java/selfie/SelfieSettings.java diff --git a/gradle.properties b/jvm/gradle.properties similarity index 100% rename from gradle.properties rename to jvm/gradle.properties diff --git a/gradle/dokka/README.md b/jvm/gradle/dokka/README.md similarity index 100% rename from gradle/dokka/README.md rename to jvm/gradle/dokka/README.md diff --git a/gradle/dokka/assets/antique_bot.webp b/jvm/gradle/dokka/assets/antique_bot.webp similarity index 100% rename from gradle/dokka/assets/antique_bot.webp rename to jvm/gradle/dokka/assets/antique_bot.webp diff --git a/gradle/dokka/assets/antique_humanoid.webp b/jvm/gradle/dokka/assets/antique_humanoid.webp similarity index 100% rename from gradle/dokka/assets/antique_humanoid.webp rename to jvm/gradle/dokka/assets/antique_humanoid.webp diff --git a/gradle/dokka/assets/background_floral.webp b/jvm/gradle/dokka/assets/background_floral.webp similarity index 100% rename from gradle/dokka/assets/background_floral.webp rename to jvm/gradle/dokka/assets/background_floral.webp diff --git a/gradle/dokka/assets/background_seaside.webp b/jvm/gradle/dokka/assets/background_seaside.webp similarity index 100% rename from gradle/dokka/assets/background_seaside.webp rename to jvm/gradle/dokka/assets/background_seaside.webp diff --git a/docs/public/logo-icon-large.svg b/jvm/gradle/dokka/assets/logo-icon-large.svg similarity index 100% rename from docs/public/logo-icon-large.svg rename to jvm/gradle/dokka/assets/logo-icon-large.svg diff --git a/docs/public/logo-icon.svg b/jvm/gradle/dokka/assets/logo-icon.svg similarity index 100% rename from docs/public/logo-icon.svg rename to jvm/gradle/dokka/assets/logo-icon.svg diff --git a/gradle/dokka/dokkatoo.gradle b/jvm/gradle/dokka/dokkatoo.gradle similarity index 100% rename from gradle/dokka/dokkatoo.gradle rename to jvm/gradle/dokka/dokkatoo.gradle diff --git a/gradle/dokka/scripts/selfie.js b/jvm/gradle/dokka/scripts/selfie.js similarity index 100% rename from gradle/dokka/scripts/selfie.js rename to jvm/gradle/dokka/scripts/selfie.js diff --git a/gradle/dokka/styles/selfie-style.css b/jvm/gradle/dokka/styles/selfie-style.css similarity index 100% rename from gradle/dokka/styles/selfie-style.css rename to jvm/gradle/dokka/styles/selfie-style.css diff --git a/gradle/dokka/templates/includes/footer.ftl b/jvm/gradle/dokka/templates/includes/footer.ftl similarity index 100% rename from gradle/dokka/templates/includes/footer.ftl rename to jvm/gradle/dokka/templates/includes/footer.ftl diff --git a/gradle/dokka/templates/includes/header.ftl b/jvm/gradle/dokka/templates/includes/header.ftl similarity index 100% rename from gradle/dokka/templates/includes/header.ftl rename to jvm/gradle/dokka/templates/includes/header.ftl diff --git a/gradle/spotless.gradle b/jvm/gradle/spotless.gradle similarity index 100% rename from gradle/spotless.gradle rename to jvm/gradle/spotless.gradle diff --git a/gradle/wrapper/gradle-wrapper.jar b/jvm/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/wrapper/gradle-wrapper.jar rename to jvm/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/jvm/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/wrapper/gradle-wrapper.properties rename to jvm/gradle/wrapper/gradle-wrapper.properties diff --git a/gradlew b/jvm/gradlew similarity index 100% rename from gradlew rename to jvm/gradlew diff --git a/gradlew.bat b/jvm/gradlew.bat similarity index 100% rename from gradlew.bat rename to jvm/gradlew.bat diff --git a/kotlin-js-store/yarn.lock b/jvm/kotlin-js-store/yarn.lock similarity index 100% rename from kotlin-js-store/yarn.lock rename to jvm/kotlin-js-store/yarn.lock diff --git a/selfie-lib/README.md b/jvm/selfie-lib/README.md similarity index 100% rename from selfie-lib/README.md rename to jvm/selfie-lib/README.md diff --git a/selfie-lib/build.gradle b/jvm/selfie-lib/build.gradle similarity index 100% rename from selfie-lib/build.gradle rename to jvm/selfie-lib/build.gradle diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/ArrayMap.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/ArrayMap.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/ArrayMap.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/ArrayMap.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Lens.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Lens.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Lens.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Lens.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Mode.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Mode.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Mode.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Mode.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Selfie.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Selfie.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Selfie.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Selfie.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/SnapshotFile.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/SnapshotFile.kt similarity index 99% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/SnapshotFile.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/SnapshotFile.kt index 714f672b..27d743ec 100644 --- a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/SnapshotFile.kt +++ b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/SnapshotFile.kt @@ -375,7 +375,7 @@ class SnapshotValueReader(val lineReader: LineReader) { private const val FLAG_BASE64 = " ═╗ base64" /** - * https://github.com/diffplug/selfie/blob/main/selfie-lib/src/commonTest/resources/com/diffplug/selfie/scenarios_and_lenses.ss + * https://github.com/diffplug/selfie/blob/main/jvm/selfie-lib/src/commonTest/resources/com/diffplug/selfie/scenarios_and_lenses.ss */ internal val nameEsc = PerCharacterEscaper.specifiedEscape("\\\\[(])\nn\tt╔┌╗┐═─") diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/CommentTracker.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/CommentTracker.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/CommentTracker.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/CommentTracker.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Slice.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Slice.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Slice.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Slice.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SourceFile.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SourceFile.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SourceFile.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/SourceFile.kt diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/WriteTracker.kt b/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/WriteTracker.kt similarity index 100% rename from selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/WriteTracker.kt rename to jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/WriteTracker.kt diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/ArrayMapTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/ArrayMapTest.kt similarity index 99% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/ArrayMapTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/ArrayMapTest.kt index 45d68b70..f72025b7 100644 --- a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/ArrayMapTest.kt +++ b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/ArrayMapTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/PerCharacterEscaperTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/PerCharacterEscaperTest.kt similarity index 98% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/PerCharacterEscaperTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/PerCharacterEscaperTest.kt index 373cbac9..8519be67 100644 --- a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/PerCharacterEscaperTest.kt +++ b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/PerCharacterEscaperTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2023 DiffPlug + * Copyright (C) 2016-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/KotlinMultilineString.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/KotlinMultilineString.kt similarity index 100% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/KotlinMultilineString.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/KotlinMultilineString.kt diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralBooleanTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralBooleanTest.kt similarity index 100% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralBooleanTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralBooleanTest.kt diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralIntTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralIntTest.kt similarity index 100% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralIntTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralIntTest.kt diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralLongTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralLongTest.kt similarity index 100% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralLongTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralLongTest.kt diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralStringTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralStringTest.kt similarity index 100% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralStringTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/LiteralStringTest.kt diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SliceTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SliceTest.kt similarity index 100% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SliceTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SliceTest.kt diff --git a/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SourceFileToBeTest.kt b/jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SourceFileToBeTest.kt similarity index 100% rename from selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SourceFileToBeTest.kt rename to jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/guts/SourceFileToBeTest.kt diff --git a/selfie-lib/src/commonTest/resources/com/diffplug/selfie/example.ss b/jvm/selfie-lib/src/commonTest/resources/com/diffplug/selfie/example.ss similarity index 100% rename from selfie-lib/src/commonTest/resources/com/diffplug/selfie/example.ss rename to jvm/selfie-lib/src/commonTest/resources/com/diffplug/selfie/example.ss diff --git a/selfie-lib/src/commonTest/resources/com/diffplug/selfie/scenarios_and_lenses.ss b/jvm/selfie-lib/src/commonTest/resources/com/diffplug/selfie/scenarios_and_lenses.ss similarity index 100% rename from selfie-lib/src/commonTest/resources/com/diffplug/selfie/scenarios_and_lenses.ss rename to jvm/selfie-lib/src/commonTest/resources/com/diffplug/selfie/scenarios_and_lenses.ss diff --git a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/ArrayMap.js.kt b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/ArrayMap.js.kt similarity index 96% rename from selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/ArrayMap.js.kt rename to jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/ArrayMap.js.kt index 19ce8257..e962979b 100644 --- a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/ArrayMap.js.kt +++ b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/ArrayMap.js.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.js.kt b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.js.kt similarity index 100% rename from selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.js.kt rename to jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.js.kt diff --git a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/SnapshotFile.js.kt b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/SnapshotFile.js.kt similarity index 96% rename from selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/SnapshotFile.js.kt rename to jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/SnapshotFile.js.kt index 8b85719c..55c5958b 100644 --- a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/SnapshotFile.js.kt +++ b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/SnapshotFile.js.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/CommentTracker.js.kt b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/CommentTracker.js.kt similarity index 100% rename from selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/CommentTracker.js.kt rename to jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/CommentTracker.js.kt diff --git a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/Literals.js.kt b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/Literals.js.kt similarity index 100% rename from selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/Literals.js.kt rename to jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/Literals.js.kt diff --git a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.js.kt b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.js.kt similarity index 100% rename from selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.js.kt rename to jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.js.kt diff --git a/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/WriteTracker.js.kt b/jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/WriteTracker.js.kt similarity index 100% rename from selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/WriteTracker.js.kt rename to jvm/selfie-lib/src/jsMain/kotlin/com/diffplug/selfie/guts/WriteTracker.js.kt diff --git a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/ArrayMap.jvm.kt b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/ArrayMap.jvm.kt similarity index 95% rename from selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/ArrayMap.jvm.kt rename to jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/ArrayMap.jvm.kt index f9a22fa7..de6b15db 100644 --- a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/ArrayMap.jvm.kt +++ b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/ArrayMap.jvm.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.jvm.kt b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.jvm.kt similarity index 100% rename from selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.jvm.kt rename to jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/PerCharacterEscaper.jvm.kt diff --git a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/SnapshotFile.jvm.kt b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/SnapshotFile.jvm.kt similarity index 98% rename from selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/SnapshotFile.jvm.kt rename to jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/SnapshotFile.jvm.kt index 60d5cc4c..9737df92 100644 --- a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/SnapshotFile.jvm.kt +++ b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/SnapshotFile.jvm.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/CommentTracker.jvm.kt b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/CommentTracker.jvm.kt similarity index 100% rename from selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/CommentTracker.jvm.kt rename to jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/CommentTracker.jvm.kt diff --git a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/Literals.jvm.kt b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/Literals.jvm.kt similarity index 100% rename from selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/Literals.jvm.kt rename to jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/Literals.jvm.kt diff --git a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.jvm.kt b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.jvm.kt similarity index 100% rename from selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.jvm.kt rename to jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/SnapshotStorage.jvm.kt diff --git a/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/WriteTracker.jvm.kt b/jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/WriteTracker.jvm.kt similarity index 100% rename from selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/WriteTracker.jvm.kt rename to jvm/selfie-lib/src/jvmMain/kotlin/com/diffplug/selfie/guts/WriteTracker.jvm.kt diff --git a/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/LineReaderTest.kt b/jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/LineReaderTest.kt similarity index 98% rename from selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/LineReaderTest.kt rename to jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/LineReaderTest.kt index b844a41b..17b717ba 100644 --- a/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/LineReaderTest.kt +++ b/jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/LineReaderTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotFileTest.kt b/jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotFileTest.kt similarity index 100% rename from selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotFileTest.kt rename to jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotFileTest.kt diff --git a/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotReaderTest.kt b/jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotReaderTest.kt similarity index 100% rename from selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotReaderTest.kt rename to jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotReaderTest.kt diff --git a/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotValueReaderTest.kt b/jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotValueReaderTest.kt similarity index 100% rename from selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotValueReaderTest.kt rename to jvm/selfie-lib/src/jvmTest/kotlin/com/diffplug/selfie/SnapshotValueReaderTest.kt diff --git a/selfie-lib/src/jvmTest/kotlin/testpkg/RecordCallTest.kt b/jvm/selfie-lib/src/jvmTest/kotlin/testpkg/RecordCallTest.kt similarity index 100% rename from selfie-lib/src/jvmTest/kotlin/testpkg/RecordCallTest.kt rename to jvm/selfie-lib/src/jvmTest/kotlin/testpkg/RecordCallTest.kt diff --git a/selfie-runner-junit5/README.md b/jvm/selfie-runner-junit5/README.md similarity index 100% rename from selfie-runner-junit5/README.md rename to jvm/selfie-runner-junit5/README.md diff --git a/selfie-runner-junit5/build.gradle b/jvm/selfie-runner-junit5/build.gradle similarity index 100% rename from selfie-runner-junit5/build.gradle rename to jvm/selfie-runner-junit5/build.gradle diff --git a/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieGC.kt b/jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieGC.kt similarity index 100% rename from selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieGC.kt rename to jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieGC.kt diff --git a/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieSettingsAPI.kt b/jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieSettingsAPI.kt similarity index 100% rename from selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieSettingsAPI.kt rename to jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieSettingsAPI.kt diff --git a/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieTestExecutionListener.kt b/jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieTestExecutionListener.kt similarity index 100% rename from selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieTestExecutionListener.kt rename to jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieTestExecutionListener.kt diff --git a/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotFileLayoutJUnit5.kt b/jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotFileLayoutJUnit5.kt similarity index 100% rename from selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotFileLayoutJUnit5.kt rename to jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotFileLayoutJUnit5.kt diff --git a/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotStorageJUnit5.kt b/jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotStorageJUnit5.kt similarity index 100% rename from selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotStorageJUnit5.kt rename to jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SnapshotStorageJUnit5.kt diff --git a/selfie-runner-junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/jvm/selfie-runner-junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener similarity index 100% rename from selfie-runner-junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener rename to jvm/selfie-runner-junit5/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/BinaryTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/BinaryTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/BinaryTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/BinaryTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/CarriageReturnTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/CarriageReturnTest.kt similarity index 98% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/CarriageReturnTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/CarriageReturnTest.kt index 5091a315..9a1f35dc 100644 --- a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/CarriageReturnTest.kt +++ b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/CarriageReturnTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskBasicTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskBasicTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskBasicTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskBasicTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskTodoTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskTodoTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskTodoTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DiskTodoTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DuplicateWriteTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DuplicateWriteTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DuplicateWriteTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/DuplicateWriteTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/Harness.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/Harness.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/Harness.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/Harness.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineFacetTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineFacetTest.kt similarity index 95% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineFacetTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineFacetTest.kt index 1e79b05b..2ef4649b 100644 --- a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineFacetTest.kt +++ b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineFacetTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineIntTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineIntTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineIntTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineIntTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineLongTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineLongTest.kt similarity index 98% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineLongTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineLongTest.kt index 1f3ea800..b02c2f81 100644 --- a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineLongTest.kt +++ b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InlineLongTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InteractiveTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InteractiveTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InteractiveTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/InteractiveTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/MethodLevelGCTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/MethodLevelGCTest.kt similarity index 98% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/MethodLevelGCTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/MethodLevelGCTest.kt index 9fcd4b31..8e9496fa 100644 --- a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/MethodLevelGCTest.kt +++ b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/MethodLevelGCTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ParameterizedTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ParameterizedTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ParameterizedTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ParameterizedTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/PrefixAndSubGC.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/PrefixAndSubGC.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/PrefixAndSubGC.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/PrefixAndSubGC.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ReadOnlyTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ReadOnlyTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ReadOnlyTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/ReadOnlyTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsJavaTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsJavaTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsJavaTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsJavaTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsKotlinTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsKotlinTest.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsKotlinTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/StringLiteralsKotlinTest.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/TestMethodVisibility.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/TestMethodVisibility.kt similarity index 100% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/TestMethodVisibility.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/TestMethodVisibility.kt diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/WithinMethodGCTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/WithinMethodGCTest.kt similarity index 99% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/WithinMethodGCTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/WithinMethodGCTest.kt index 67ef231d..e6773be2 100644 --- a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/WithinMethodGCTest.kt +++ b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junit5/WithinMethodGCTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junitvintage/ReadWriteVintageTest.kt b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junitvintage/ReadWriteVintageTest.kt similarity index 98% rename from selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junitvintage/ReadWriteVintageTest.kt rename to jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junitvintage/ReadWriteVintageTest.kt index 46574ce5..83714ba0 100644 --- a/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junitvintage/ReadWriteVintageTest.kt +++ b/jvm/selfie-runner-junit5/src/test/kotlin/com/diffplug/selfie/junitvintage/ReadWriteVintageTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 DiffPlug + * Copyright (C) 2023-2024 DiffPlug * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/settings.gradle b/jvm/settings.gradle similarity index 94% rename from settings.gradle rename to jvm/settings.gradle index f4636ebb..b457d322 100644 --- a/settings.gradle +++ b/jvm/settings.gradle @@ -32,11 +32,6 @@ plugins { blowdryerSetup { github 'diffplug/blowdryer-diffplug', 'tag', '7.2.0' //devLocal '../blowdryer-diffplug' - setPluginsBlockTo { - it.file 'plugin.versions' - it.file 'plugin-kotlin.versions' - it.replace('\t', ' ') - } } include 'selfie-lib' diff --git a/undertest-junit-vintage/build.gradle b/jvm/undertest-junit-vintage/build.gradle similarity index 100% rename from undertest-junit-vintage/build.gradle rename to jvm/undertest-junit-vintage/build.gradle diff --git a/undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.kt b/jvm/undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.kt similarity index 100% rename from undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.kt rename to jvm/undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.kt diff --git a/undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.ss b/jvm/undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.ss similarity index 100% rename from undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.ss rename to jvm/undertest-junit-vintage/src/test/kotlin/undertest/junit5/UT_ReadWriteVintageTest.ss diff --git a/undertest-junit5/build.gradle b/jvm/undertest-junit5/build.gradle similarity index 100% rename from undertest-junit5/build.gradle rename to jvm/undertest-junit5/build.gradle diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_CarriageReturnTest.ss b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_CarriageReturnTest.ss similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_CarriageReturnTest.ss rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_CarriageReturnTest.ss diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_DuplicateWriteTest.ss b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_DuplicateWriteTest.ss similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_DuplicateWriteTest.ss rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_DuplicateWriteTest.ss diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_ParameterizedTest.ss b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_ParameterizedTest.ss similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_ParameterizedTest.ss rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_ParameterizedTest.ss diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_PrefixAndSubGC.ss b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_PrefixAndSubGC.ss similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_PrefixAndSubGC.ss rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_PrefixAndSubGC.ss diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_StringLiteralsJavaTest.java b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_StringLiteralsJavaTest.java similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_StringLiteralsJavaTest.java rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_StringLiteralsJavaTest.java diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.java b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.java similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.java rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.java diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.ss b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.ss similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.ss rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibility.ss diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibilityParentClass.java b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibilityParentClass.java similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibilityParentClass.java rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_TestMethodVisibilityParentClass.java diff --git a/undertest-junit5/src/test/java/undertest/junit5/UT_WithinMethodGCTest.ss b/jvm/undertest-junit5/src/test/java/undertest/junit5/UT_WithinMethodGCTest.ss similarity index 100% rename from undertest-junit5/src/test/java/undertest/junit5/UT_WithinMethodGCTest.ss rename to jvm/undertest-junit5/src/test/java/undertest/junit5/UT_WithinMethodGCTest.ss diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/SelfieWriteOnce.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/SelfieWriteOnce.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/SelfieWriteOnce.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/SelfieWriteOnce.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/SimpleTestThatAlwaysPasses.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/SimpleTestThatAlwaysPasses.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/SimpleTestThatAlwaysPasses.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/SimpleTestThatAlwaysPasses.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_BinaryTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_BinaryTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_BinaryTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_BinaryTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_CarriageReturnTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_CarriageReturnTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_CarriageReturnTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_CarriageReturnTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskBasicTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskBasicTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskBasicTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskBasicTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskTodoTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskTodoTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskTodoTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DiskTodoTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DuplicateWriteTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DuplicateWriteTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_DuplicateWriteTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_DuplicateWriteTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineFacetTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineFacetTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineFacetTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineFacetTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineIntTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineIntTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineIntTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineIntTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineLongTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineLongTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineLongTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineLongTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InteractiveTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InteractiveTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_InteractiveTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InteractiveTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_MethodLevelGCTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_MethodLevelGCTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_MethodLevelGCTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_MethodLevelGCTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_ParameterizedTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_ParameterizedTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_ParameterizedTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_ParameterizedTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_PrefixAndSubGC.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_PrefixAndSubGC.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_PrefixAndSubGC.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_PrefixAndSubGC.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_ReadOnlyTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_ReadOnlyTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_ReadOnlyTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_ReadOnlyTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_StringLiteralsKotlinTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_StringLiteralsKotlinTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_StringLiteralsKotlinTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_StringLiteralsKotlinTest.kt diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_WithinMethodGCTest.kt b/jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_WithinMethodGCTest.kt similarity index 100% rename from undertest-junit5/src/test/kotlin/undertest/junit5/UT_WithinMethodGCTest.kt rename to jvm/undertest-junit5/src/test/kotlin/undertest/junit5/UT_WithinMethodGCTest.kt diff --git a/renovate.json b/renovate.json index 5db72dd6..3685f05f 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,15 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended" + ], + "packageRules": [ + { + "paths": ["selfie.dev/"], + "labels": ["selfie.dev"] + }, + { + "paths": ["jvm/"], + "labels": ["jvm"] + } ] -} +} \ No newline at end of file diff --git a/docs/.gitignore b/selfie.dev/.gitignore similarity index 100% rename from docs/.gitignore rename to selfie.dev/.gitignore diff --git a/docs/.nvmrc b/selfie.dev/.nvmrc similarity index 100% rename from docs/.nvmrc rename to selfie.dev/.nvmrc diff --git a/docs/README.md b/selfie.dev/README.md similarity index 100% rename from docs/README.md rename to selfie.dev/README.md diff --git a/docs/github-mark.svg b/selfie.dev/github-mark.svg similarity index 100% rename from docs/github-mark.svg rename to selfie.dev/github-mark.svg diff --git a/docs/next-env.d.ts b/selfie.dev/next-env.d.ts similarity index 100% rename from docs/next-env.d.ts rename to selfie.dev/next-env.d.ts diff --git a/docs/next.config.mjs b/selfie.dev/next.config.mjs similarity index 100% rename from docs/next.config.mjs rename to selfie.dev/next.config.mjs diff --git a/docs/package-lock.json b/selfie.dev/package-lock.json similarity index 100% rename from docs/package-lock.json rename to selfie.dev/package-lock.json diff --git a/docs/package.json b/selfie.dev/package.json similarity index 100% rename from docs/package.json rename to selfie.dev/package.json diff --git a/docs/postcss.config.js b/selfie.dev/postcss.config.js similarity index 100% rename from docs/postcss.config.js rename to selfie.dev/postcss.config.js diff --git a/docs/public/_redirects b/selfie.dev/public/_redirects similarity index 100% rename from docs/public/_redirects rename to selfie.dev/public/_redirects diff --git a/docs/public/advanced.webp b/selfie.dev/public/advanced.webp similarity index 100% rename from docs/public/advanced.webp rename to selfie.dev/public/advanced.webp diff --git a/docs/public/car-1536w.webp b/selfie.dev/public/car-1536w.webp similarity index 100% rename from docs/public/car-1536w.webp rename to selfie.dev/public/car-1536w.webp diff --git a/docs/public/car-3072w.webp b/selfie.dev/public/car-3072w.webp similarity index 100% rename from docs/public/car-3072w.webp rename to selfie.dev/public/car-3072w.webp diff --git a/docs/public/car_feathered.webp b/selfie.dev/public/car_feathered.webp similarity index 100% rename from docs/public/car_feathered.webp rename to selfie.dev/public/car_feathered.webp diff --git a/docs/public/feather_mask_car.svg b/selfie.dev/public/feather_mask_car.svg similarity index 100% rename from docs/public/feather_mask_car.svg rename to selfie.dev/public/feather_mask_car.svg diff --git a/docs/public/feather_mask_horse.svg b/selfie.dev/public/feather_mask_horse.svg similarity index 100% rename from docs/public/feather_mask_horse.svg rename to selfie.dev/public/feather_mask_horse.svg diff --git a/docs/public/fumble.webp b/selfie.dev/public/fumble.webp similarity index 100% rename from docs/public/fumble.webp rename to selfie.dev/public/fumble.webp diff --git a/docs/public/get-started.webp b/selfie.dev/public/get-started.webp similarity index 100% rename from docs/public/get-started.webp rename to selfie.dev/public/get-started.webp diff --git a/docs/public/horse-1536w.webp b/selfie.dev/public/horse-1536w.webp similarity index 100% rename from docs/public/horse-1536w.webp rename to selfie.dev/public/horse-1536w.webp diff --git a/docs/public/horse-3072w.webp b/selfie.dev/public/horse-3072w.webp similarity index 100% rename from docs/public/horse-3072w.webp rename to selfie.dev/public/horse-3072w.webp diff --git a/docs/public/horse_feathered.webp b/selfie.dev/public/horse_feathered.webp similarity index 100% rename from docs/public/horse_feathered.webp rename to selfie.dev/public/horse_feathered.webp diff --git a/gradle/dokka/assets/logo-icon-large.svg b/selfie.dev/public/logo-icon-large.svg similarity index 100% rename from gradle/dokka/assets/logo-icon-large.svg rename to selfie.dev/public/logo-icon-large.svg diff --git a/gradle/dokka/assets/logo-icon.svg b/selfie.dev/public/logo-icon.svg similarity index 100% rename from gradle/dokka/assets/logo-icon.svg rename to selfie.dev/public/logo-icon.svg diff --git a/docs/public/mascot.webp b/selfie.dev/public/mascot.webp similarity index 100% rename from docs/public/mascot.webp rename to selfie.dev/public/mascot.webp diff --git a/docs/public/sitemap.xml b/selfie.dev/public/sitemap.xml similarity index 100% rename from docs/public/sitemap.xml rename to selfie.dev/public/sitemap.xml diff --git a/docs/public/twitter-card.webp b/selfie.dev/public/twitter-card.webp similarity index 100% rename from docs/public/twitter-card.webp rename to selfie.dev/public/twitter-card.webp diff --git a/docs/selfie_logo_only.png b/selfie.dev/selfie_logo_only.png similarity index 100% rename from docs/selfie_logo_only.png rename to selfie.dev/selfie_logo_only.png diff --git a/docs/src/components/Advanced.tsx b/selfie.dev/src/components/Advanced.tsx similarity index 100% rename from docs/src/components/Advanced.tsx rename to selfie.dev/src/components/Advanced.tsx diff --git a/docs/src/components/Button.tsx b/selfie.dev/src/components/Button.tsx similarity index 100% rename from docs/src/components/Button.tsx rename to selfie.dev/src/components/Button.tsx diff --git a/docs/src/components/ButtonList.tsx b/selfie.dev/src/components/ButtonList.tsx similarity index 100% rename from docs/src/components/ButtonList.tsx rename to selfie.dev/src/components/ButtonList.tsx diff --git a/docs/src/components/FooterCTA/Car.tsx b/selfie.dev/src/components/FooterCTA/Car.tsx similarity index 100% rename from docs/src/components/FooterCTA/Car.tsx rename to selfie.dev/src/components/FooterCTA/Car.tsx diff --git a/docs/src/components/FooterCTA/FooterCTA.tsx b/selfie.dev/src/components/FooterCTA/FooterCTA.tsx similarity index 100% rename from docs/src/components/FooterCTA/FooterCTA.tsx rename to selfie.dev/src/components/FooterCTA/FooterCTA.tsx diff --git a/docs/src/components/FooterCTA/Horse.tsx b/selfie.dev/src/components/FooterCTA/Horse.tsx similarity index 100% rename from docs/src/components/FooterCTA/Horse.tsx rename to selfie.dev/src/components/FooterCTA/Horse.tsx diff --git a/docs/src/components/FooterCTA/constants.ts b/selfie.dev/src/components/FooterCTA/constants.ts similarity index 100% rename from docs/src/components/FooterCTA/constants.ts rename to selfie.dev/src/components/FooterCTA/constants.ts diff --git a/docs/src/components/GetStarted.tsx b/selfie.dev/src/components/GetStarted.tsx similarity index 100% rename from docs/src/components/GetStarted.tsx rename to selfie.dev/src/components/GetStarted.tsx diff --git a/docs/src/components/HeadingAnchor.tsx b/selfie.dev/src/components/HeadingAnchor.tsx similarity index 100% rename from docs/src/components/HeadingAnchor.tsx rename to selfie.dev/src/components/HeadingAnchor.tsx diff --git a/docs/src/components/HeadingPopout.tsx b/selfie.dev/src/components/HeadingPopout.tsx similarity index 100% rename from docs/src/components/HeadingPopout.tsx rename to selfie.dev/src/components/HeadingPopout.tsx diff --git a/docs/src/components/Hero.tsx b/selfie.dev/src/components/Hero.tsx similarity index 100% rename from docs/src/components/Hero.tsx rename to selfie.dev/src/components/Hero.tsx diff --git a/docs/src/components/Icons/CaretBottom.tsx b/selfie.dev/src/components/Icons/CaretBottom.tsx similarity index 100% rename from docs/src/components/Icons/CaretBottom.tsx rename to selfie.dev/src/components/Icons/CaretBottom.tsx diff --git a/docs/src/components/Icons/Close.tsx b/selfie.dev/src/components/Icons/Close.tsx similarity index 100% rename from docs/src/components/Icons/Close.tsx rename to selfie.dev/src/components/Icons/Close.tsx diff --git a/docs/src/components/Icons/LinkIcon.tsx b/selfie.dev/src/components/Icons/LinkIcon.tsx similarity index 100% rename from docs/src/components/Icons/LinkIcon.tsx rename to selfie.dev/src/components/Icons/LinkIcon.tsx diff --git a/docs/src/components/Icons/Octocat.tsx b/selfie.dev/src/components/Icons/Octocat.tsx similarity index 100% rename from docs/src/components/Icons/Octocat.tsx rename to selfie.dev/src/components/Icons/Octocat.tsx diff --git a/docs/src/components/Icons/Popout.tsx b/selfie.dev/src/components/Icons/Popout.tsx similarity index 100% rename from docs/src/components/Icons/Popout.tsx rename to selfie.dev/src/components/Icons/Popout.tsx diff --git a/docs/src/components/IntroText.tsx b/selfie.dev/src/components/IntroText.tsx similarity index 100% rename from docs/src/components/IntroText.tsx rename to selfie.dev/src/components/IntroText.tsx diff --git a/docs/src/components/Logo.tsx b/selfie.dev/src/components/Logo.tsx similarity index 100% rename from docs/src/components/Logo.tsx rename to selfie.dev/src/components/Logo.tsx diff --git a/docs/src/components/Mascot.tsx b/selfie.dev/src/components/Mascot.tsx similarity index 100% rename from docs/src/components/Mascot.tsx rename to selfie.dev/src/components/Mascot.tsx diff --git a/docs/src/components/NavHeading.tsx b/selfie.dev/src/components/NavHeading.tsx similarity index 100% rename from docs/src/components/NavHeading.tsx rename to selfie.dev/src/components/NavHeading.tsx diff --git a/docs/src/components/Navigation/LanguageSelect.tsx b/selfie.dev/src/components/Navigation/LanguageSelect.tsx similarity index 100% rename from docs/src/components/Navigation/LanguageSelect.tsx rename to selfie.dev/src/components/Navigation/LanguageSelect.tsx diff --git a/docs/src/components/Navigation/Navigation.tsx b/selfie.dev/src/components/Navigation/Navigation.tsx similarity index 100% rename from docs/src/components/Navigation/Navigation.tsx rename to selfie.dev/src/components/Navigation/Navigation.tsx diff --git a/docs/src/components/Navigation/SubNavigation.tsx b/selfie.dev/src/components/Navigation/SubNavigation.tsx similarity index 100% rename from docs/src/components/Navigation/SubNavigation.tsx rename to selfie.dev/src/components/Navigation/SubNavigation.tsx diff --git a/docs/src/components/Selfie.tsx b/selfie.dev/src/components/Selfie.tsx similarity index 100% rename from docs/src/components/Selfie.tsx rename to selfie.dev/src/components/Selfie.tsx diff --git a/docs/src/components/mdx.tsx b/selfie.dev/src/components/mdx.tsx similarity index 100% rename from docs/src/components/mdx.tsx rename to selfie.dev/src/components/mdx.tsx diff --git a/docs/src/lib/languageFromPath.ts b/selfie.dev/src/lib/languageFromPath.ts similarity index 100% rename from docs/src/lib/languageFromPath.ts rename to selfie.dev/src/lib/languageFromPath.ts diff --git a/docs/src/lib/useResizing.ts b/selfie.dev/src/lib/useResizing.ts similarity index 100% rename from docs/src/lib/useResizing.ts rename to selfie.dev/src/lib/useResizing.ts diff --git a/docs/src/mdx/recma.mjs b/selfie.dev/src/mdx/recma.mjs similarity index 100% rename from docs/src/mdx/recma.mjs rename to selfie.dev/src/mdx/recma.mjs diff --git a/docs/src/mdx/rehype.mjs b/selfie.dev/src/mdx/rehype.mjs similarity index 100% rename from docs/src/mdx/rehype.mjs rename to selfie.dev/src/mdx/rehype.mjs diff --git a/docs/src/mdx/remark.mjs b/selfie.dev/src/mdx/remark.mjs similarity index 100% rename from docs/src/mdx/remark.mjs rename to selfie.dev/src/mdx/remark.mjs diff --git a/docs/src/mdx/search.mjs b/selfie.dev/src/mdx/search.mjs similarity index 100% rename from docs/src/mdx/search.mjs rename to selfie.dev/src/mdx/search.mjs diff --git a/docs/src/pages/404.tsx b/selfie.dev/src/pages/404.tsx similarity index 100% rename from docs/src/pages/404.tsx rename to selfie.dev/src/pages/404.tsx diff --git a/docs/src/pages/_app.tsx b/selfie.dev/src/pages/_app.tsx similarity index 100% rename from docs/src/pages/_app.tsx rename to selfie.dev/src/pages/_app.tsx diff --git a/docs/src/pages/_document.tsx b/selfie.dev/src/pages/_document.tsx similarity index 100% rename from docs/src/pages/_document.tsx rename to selfie.dev/src/pages/_document.tsx diff --git a/docs/src/pages/jvm/advanced.mdx b/selfie.dev/src/pages/jvm/advanced.mdx similarity index 95% rename from docs/src/pages/jvm/advanced.mdx rename to selfie.dev/src/pages/jvm/advanced.mdx index d9bcfcc1..ba98d857 100644 --- a/docs/src/pages/jvm/advanced.mdx +++ b/selfie.dev/src/pages/jvm/advanced.mdx @@ -9,7 +9,7 @@ Assuming you have [installed selfie](/jvm/get-started#installation) and glanced ## Our toy project -We'll be using the [`example-junit5`](https://github.com/diffplug/selfie/tree/main/example-junit5) project from the selfie GitHub repo. You can clone the code and follow along, but there's no need to. If you did clone the project, you could run `gradlew exampleAppJvm` and you'd have a little [jooby](https://jooby.io/) webapp running at `localhost:8080`. +We'll be using the [`example-junit5`](https://github.com/diffplug/selfie/tree/main/jvm/example-junit5) project from the selfie GitHub repo. You can clone the code and follow along, but there's no need to. If you did clone the project, you could run `gradlew exampleAppJvm` and you'd have a little [jooby](https://jooby.io/) webapp running at `localhost:8080`. It has a homepage where we can login. We can go to `/email` to see the emails the server has sent and click our login link, and boom we've got some auth cookies. @@ -196,7 +196,7 @@ private static final Lens HTML = new CompoundLens() Snapshot testing has been badly underused for three reasons: - controlling read vs write used to be cumbersome (fixed by [control comments](https://selfie.dev/jvm/get-started#quickstart)) -- stale snapshots used to pile up (fixed by [garbage collection](https://github.com/diffplug/selfie/blob/main/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieGC.kt)) +- stale snapshots used to pile up (fixed by [garbage collection](https://github.com/diffplug/selfie/blob/main/jvm/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/junit5/SelfieGC.kt)) - a great test should tell a story, and disk snapshots can't do that Inline snapshots are a partial fix for storytelling within a test, but the harnessing can become verbose. This is where we combine it all: @@ -237,7 +237,7 @@ status code: 401"""); } ``` -We just wrote a high-level specification of a realistic login flow, and it only took 25 lines of java code — most of which were generated for us, and could be regenerated on a whim if we want to change our copywriting. The [corresponding disk snapshot](https://github.com/diffplug/selfie/blob/main/example-junit5/src/test/java/com/example/LoginFlowTest.ss) gives us an exhaustive specification and description of the server's behavior. +We just wrote a high-level specification of a realistic login flow, and it only took 25 lines of java code — most of which were generated for us, and could be regenerated on a whim if we want to change our copywriting. The [corresponding disk snapshot](https://github.com/diffplug/selfie/blob/main/jvm/example-junit5/src/test/java/com/example/LoginFlowTest.ss) gives us an exhaustive specification and description of the server's behavior. Didn't think that adopting a bugfixed version of your internationalization lib would cause any changes to your website whatsever? Oops. Don't wade through failed assertions, get a diff in every failure. If you want, regenerate all the snapshots to get a full view of the problem across the whole codebase in your git client. diff --git a/docs/src/pages/jvm/get-started.mdx b/selfie.dev/src/pages/jvm/get-started.mdx similarity index 95% rename from docs/src/pages/jvm/get-started.mdx rename to selfie.dev/src/pages/jvm/get-started.mdx index fa5b0357..ede343c1 100644 --- a/docs/src/pages/jvm/get-started.mdx +++ b/selfie.dev/src/pages/jvm/get-started.mdx @@ -25,7 +25,7 @@ Disk snapshots can be used with any JVM language, but inline literal snapshots o - groovy - scala -Adding support for other languages is [straightforward](https://github.com/diffplug/selfie/blob/main/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt), PRs are welcome! +Adding support for other languages is [straightforward](https://github.com/diffplug/selfie/blob/main/jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt), PRs are welcome! ### Maven @@ -40,7 +40,7 @@ If you're using Maven, add the following dependency to your `pom.xml` file: ``` -Replace `LATEST_VERSION` with the [latest available version of selfie](https://github.com/diffplug/selfie/blob/main/CHANGELOG.md). +Replace `LATEST_VERSION` with the [latest available version of selfie](https://github.com/diffplug/selfie/blob/main/jvm/CHANGELOG.md). ### Gradle @@ -50,7 +50,7 @@ For Gradle users, add this to your `build.gradle` file: testImplementation 'com.diffplug.selfie:selfie-runner-junit5:LATEST_VERSION' ``` -Again, replace `LATEST_VERSION` with the [latest available version of selfie](https://github.com/diffplug/selfie/blob/main/CHANGELOG.md). +Again, replace `LATEST_VERSION` with the [latest available version of selfie](https://github.com/diffplug/selfie/blob/main/jvm/CHANGELOG.md). ## Quickstart diff --git a/docs/src/pages/jvm/index.mdx b/selfie.dev/src/pages/jvm/index.mdx similarity index 100% rename from docs/src/pages/jvm/index.mdx rename to selfie.dev/src/pages/jvm/index.mdx diff --git a/docs/src/styles/tailwind.css b/selfie.dev/src/styles/tailwind.css similarity index 100% rename from docs/src/styles/tailwind.css rename to selfie.dev/src/styles/tailwind.css diff --git a/docs/tailwind.config.js b/selfie.dev/tailwind.config.js similarity index 100% rename from docs/tailwind.config.js rename to selfie.dev/tailwind.config.js diff --git a/docs/tsconfig.json b/selfie.dev/tsconfig.json similarity index 100% rename from docs/tsconfig.json rename to selfie.dev/tsconfig.json