From 3898940d06f0b4929de08b2126c832b8f05174f1 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 26 Mar 2022 17:49:50 +0100 Subject: [PATCH 1/4] fix grpackage methods for pharo100 (useless?) --- .../GRPackage.class/instance/resolveWith..st | 22 ++++++++++--------- ...sePharo70Core.st => greasePharo100Core.st} | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) rename repository/Grease-Pharo100-Core.package/GRPackage.extension/class/{greasePharo70Core.st => greasePharo100Core.st} (65%) diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st index d7d8a964..2707d7f0 100644 --- a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st +++ b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st @@ -14,13 +14,15 @@ resolveWith: aDictionary "try -Pharo70-" aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [ "try -Pharo90-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [ - "try -Squeak-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [ - "try -Squeak5-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [ - "try -Squeak6-" - aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [ - "specific for Grease-Slime" - aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [ - self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] \ No newline at end of file + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [ + "try -Pharo100-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo100-') ifAbsent: [ + "try -Squeak-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [ + "try -Squeak5-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [ + "try -Squeak6-" + aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [ + "specific for Grease-Slime" + aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [ + self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ] \ No newline at end of file diff --git a/repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo70Core.st b/repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo100Core.st similarity index 65% rename from repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo70Core.st rename to repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo100Core.st index 091ff123..241c674a 100644 --- a/repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo70Core.st +++ b/repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo100Core.st @@ -1,7 +1,7 @@ *Grease-Pharo100-Core -greasePharo70Core +greasePharo100Core ^ self new - name: 'Grease-Pharo90-Core'; + name: 'Grease-Pharo100-Core'; addDependency: 'Grease-Core'; url: #greaseUrl; yourself \ No newline at end of file From 27f68526dd3855edcca876de7d8db491cf565601 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 3 Apr 2022 10:21:26 +0200 Subject: [PATCH 2/4] Set an expected failure for testReadWriteEmptyFileInFolderBinary until fix https://github.com/svenvc/zinc/issues/86 is part of the released version --- .../GRPlatformTest.extension/instance/expectedFailures.st | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st b/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st new file mode 100644 index 00000000..d84912eb --- /dev/null +++ b/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st @@ -0,0 +1,6 @@ +*Grease-Tests-Pharo-Core +expectedFailures + "Fails in Pharo 10 until https://github.com/svenvc/zinc/issues/86 is part of Pharo 10" + ^ SystemVersion current major = 10 + ifTrue:[ (#testReadWriteEmptyFileInFolderBinary) ] + ifFalse: [ #() ] \ No newline at end of file From b2fcc5237d65461e21451a9586486f853d00d0e0 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 3 Apr 2022 10:24:49 +0200 Subject: [PATCH 3/4] fix expectedFailures... --- .../GRPlatformTest.extension/instance/expectedFailures.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st b/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st index d84912eb..88b657ec 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st +++ b/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st @@ -2,5 +2,5 @@ expectedFailures "Fails in Pharo 10 until https://github.com/svenvc/zinc/issues/86 is part of Pharo 10" ^ SystemVersion current major = 10 - ifTrue:[ (#testReadWriteEmptyFileInFolderBinary) ] + ifTrue:[ #(#testReadWriteEmptyFileInFolderBinary) ] ifFalse: [ #() ] \ No newline at end of file From 9c3b895089aae82f2e0d3d82020764ce12b2c054 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sun, 3 Apr 2022 10:28:30 +0200 Subject: [PATCH 4/4] increase version number to v1.8.2 --- .../Grease-Core.package/GRPlatform.class/instance/version.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/version.st b/repository/Grease-Core.package/GRPlatform.class/instance/version.st index da6fcec1..571698e7 100644 --- a/repository/Grease-Core.package/GRPlatform.class/instance/version.st +++ b/repository/Grease-Core.package/GRPlatform.class/instance/version.st @@ -2,5 +2,5 @@ version info version "Answer the Grease version" - ^ (GRVersion major: 1 minor: 8 revision: 1) + ^ (GRVersion major: 1 minor: 8 revision: 2) yourself \ No newline at end of file