From 00b08c20d8b433bbc115113ebf3d721b399c7fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20D=C3=B6rbandt?= Date: Tue, 17 Oct 2023 12:42:20 +0200 Subject: [PATCH] Sort Tonel package properties for consistent key order --- .../SquotTonelMapper.class/instance/writerOn..st | 1 + .../SquotTonelMapper.class/methodProperties.json | 2 +- .../instance/squotSortPackageProperties.st | 3 +++ .../TonelWriter.extension/methodProperties.json | 5 +++++ src/Squot.package/TonelWriter.extension/properties.json | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/Squot.package/TonelWriter.extension/instance/squotSortPackageProperties.st create mode 100644 src/Squot.package/TonelWriter.extension/methodProperties.json create mode 100644 src/Squot.package/TonelWriter.extension/properties.json diff --git a/src/Squot.package/SquotTonelMapper.class/instance/writerOn..st b/src/Squot.package/SquotTonelMapper.class/instance/writerOn..st index 0e407cc8f..ab1ee369f 100644 --- a/src/Squot.package/SquotTonelMapper.class/instance/writerOn..st +++ b/src/Squot.package/SquotTonelMapper.class/instance/writerOn..st @@ -5,4 +5,5 @@ writerOn: aFileSystem writer packageName: self package name. writer currentPackageProperties at: TonelWriter squeakChangestamp put: self writeTimestamps. + writer squotSortPackageProperties. ^ writer \ No newline at end of file diff --git a/src/Squot.package/SquotTonelMapper.class/methodProperties.json b/src/Squot.package/SquotTonelMapper.class/methodProperties.json index bc53966b4..3f8c62d52 100644 --- a/src/Squot.package/SquotTonelMapper.class/methodProperties.json +++ b/src/Squot.package/SquotTonelMapper.class/methodProperties.json @@ -8,4 +8,4 @@ "serialize:into:" : "mad 10/17/2023 11:50", "writeTimestamps" : "mad 9/26/2023 15:24", "writeTimestamps:" : "mad 9/26/2023 15:24", - "writerOn:" : "mad 10/16/2023 17:26" } } + "writerOn:" : "mad 10/16/2023 22:33" } } diff --git a/src/Squot.package/TonelWriter.extension/instance/squotSortPackageProperties.st b/src/Squot.package/TonelWriter.extension/instance/squotSortPackageProperties.st new file mode 100644 index 000000000..fe8a07101 --- /dev/null +++ b/src/Squot.package/TonelWriter.extension/instance/squotSortPackageProperties.st @@ -0,0 +1,3 @@ +*Squot-Mapper-package-properties +squotSortPackageProperties + currentPackageProperties := self currentPackageProperties withKeysSorted: nil. \ No newline at end of file diff --git a/src/Squot.package/TonelWriter.extension/methodProperties.json b/src/Squot.package/TonelWriter.extension/methodProperties.json new file mode 100644 index 000000000..99d11479f --- /dev/null +++ b/src/Squot.package/TonelWriter.extension/methodProperties.json @@ -0,0 +1,5 @@ +{ + "class" : { + }, + "instance" : { + "squotSortPackageProperties" : "mad 10/16/2023 22:33" } } diff --git a/src/Squot.package/TonelWriter.extension/properties.json b/src/Squot.package/TonelWriter.extension/properties.json new file mode 100644 index 000000000..1bbb54d1e --- /dev/null +++ b/src/Squot.package/TonelWriter.extension/properties.json @@ -0,0 +1,2 @@ +{ + "name" : "TonelWriter" }