Skip to content

Keep up with the master :-) #22

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
dalehenrich merged 17 commits into from
Sep 23, 2021
Merged

Keep up with the master :-) #22

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1397779
Change ascii to utf8 encoding for text files in Pharo 9
Aug 15, 2021
652acb5
Change ascii to utf8 encoding for text files in Pharo 7
Aug 16, 2021
d305fd5
Move utf8 test file read/write test to Pharo specific test package an…
Aug 16, 2021
eee0956
Fixed wrong version comparison for expected failure in test
Aug 16, 2021
4ab1beb
Seems like the MultiByteFileStream did write utf8 already... (so this…
Aug 16, 2021
1c04d7b
Merge pull request #123 from SeasideSt/122-Replace-ascii-encoding-for…
Aug 16, 2021
99278d4
I always keep forgetting the version info... now at 1.7.3
Aug 16, 2021
55667df
Fix GRPackage dependency declaration
Sep 7, 2021
1c55905
Added a test for broken package dependencies
Sep 7, 2021
1f93dc5
Fix package resolution for Slime exception
Sep 7, 2021
026c637
Fix package test
Sep 7, 2021
1dcdab1
SequenceableCollection>>#sorted unnecessary in Grease-Pharo90-Core
astares Sep 17, 2021
ee61205
Merge pull request #126 from astares/125-SequenceableCollectionsorted…
Sep 23, 2021
48f401f
fix issue 127 (fileExists: in GemStone reports on existence of direct…
Sep 23, 2021
ba95d23
Added test for fileExists:
Sep 23, 2021
99b0213
version 1.7.5
Sep 23, 2021
21562c9
Merge pull request #128 from SeasideSt/issue-127
Sep 23, 2021
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
Prev Previous commit
Next Next commit
Fix package resolution for Slime exception
  • Loading branch information
Johan Brichau committed Sep 7, 2021
commit 1f93dc510b6d1ddf6e9178e821c3ba80cbc0d2a3
30 changes: 13 additions & 17 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 @@ -5,20 +5,16 @@ resolveWith: aDictionary
aDictionary at: each ifAbsent: [
"if Foo-Pharo-Bar fails try Foo-Pharo20-Bar and Foo-Pharo30-Bar"
(each indexOfSubCollection: '-Pharo-' startingAt: 1) ~= 0 ifTrue: [
"try -Pharo40-"
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
"try -Pharo50-"
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
"try -Pharo60-"
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [
"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: [
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ]
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [
"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: [
aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ]