X Tutup
Skip to content

fix grpackage methods for pharo100 (useless?) #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbrichau merged 4 commits into from
Apr 3, 2022
Merged

fix grpackage methods for pharo100 (useless?) #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3898940
fix grpackage methods for pharo100 (useless?)
Mar 26, 2022
27f6852
Set an expected failure for testReadWriteEmptyFileInFolderBinary unti…
Apr 3, 2022
b2fcc52
fix expectedFailures...
Apr 3, 2022
9c3b895
increase version number to v1.8.2
Apr 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ] ] ] ] ] ] ] ] ] ]
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 ] ] ] ] ] ] ] ] ] ] ] ] ]
2 changes: 1 addition & 1 deletion repository/Grease-Core.package/GRPlatform.class/instance/version.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions ...kage.extension/class/greasePharo70Core.st → ...age.extension/class/greasePharo100Core.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions ...ory/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: [ #() ]
X Tutup