Skip to content

Grease 1.2.7 #2

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 5 commits into from
Mar 27, 2016
Merged

Grease 1.2.7 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d041ec
remove the old testTravisCI.sh
Feb 28, 2016
c3ec5e2
sync
Mar 26, 2016
8779a72
caching in travis image build
Mar 26, 2016
70f0154
Remove Process>>properties. (issue #10)
Mar 26, 2016
f1a2bce
Merge branch 'dev'
Mar 26, 2016
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
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ smalltalk:
- GemStone-3.1.0.6
- GemStone-3.2.12
- GemStone-3.3.0
cache:
directories:
- $SMALLTALK_CI_CACHE
4 changes: 3 additions & 1 deletion 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 @@ -11,4 +11,6 @@ resolveWith: aDictionary
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo30-') ifAbsent: [
"try -Pharo40-"
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ]
"try -Pharo50-"
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ]
2 changes: 1 addition & 1 deletion repository/Grease-Core.package/GRPackage.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"name" : "lr 2/17/2010 15:18",
"name:" : "lr 10/25/2009 11:26",
"printOn:" : "merged 10/20/2008 09:24",
"resolveWith:" : "jok 8/23/2014 10:59",
"resolveWith:" : "JohanBrichau 3/26/2016 15:54",
"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
"seasideUrl" : "pmm 9/12/2013 15:58",
Expand Down
8 changes: 4 additions & 4 deletions repository/Grease-Core.package/monticello.meta/categories.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SystemOrganization addCategory: #'Grease-Core'!
SystemOrganization addCategory: #'Grease-Core-Collections'!
SystemOrganization addCategory: #'Grease-Core-Exceptions'!
SystemOrganization addCategory: #'Grease-Core-Text'!
SystemOrganization addCategory: #'Grease-Core-Utilities'!
SystemOrganization addCategory: 'Grease-Core-Collections'!
SystemOrganization addCategory: 'Grease-Core-Exceptions'!
SystemOrganization addCategory: 'Grease-Core-Text'!
SystemOrganization addCategory: 'Grease-Core-Utilities'!
4 changes: 2 additions & 2 deletions repository/Grease-Core.package/monticello.meta/version
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions repository/Grease-GemStone-Core.package/Process.extension/instance/properties.st
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions repository/Grease-GemStone-Core.package/Process.extension/methodProperties.json
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions repository/Grease-GemStone-Core.package/Process.extension/properties.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion repository/Grease-GemStone-Core.package/monticello.meta/version
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 0 additions & 84 deletions tests/testTravisCI.sh
View file
Open in desktop

This file was deleted.