Skip to content

Commit d9c9daa

Browse files
author
Johan Brichau
committed
Merge pull request #2 from SeasideSt/master
Grease 1.2.7
2 parents 318e4e6 + f1a2bce commit d9c9daa

File tree

10 files changed

+14
-104
lines changed

10 files changed

+14
-104
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ smalltalk:
99
- GemStone-3.1.0.6
1010
- GemStone-3.2.12
1111
- GemStone-3.3.0
12+
cache:
13+
directories:
14+
- $SMALLTALK_CI_CACHE

repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ resolveWith: aDictionary
1111
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo30-') ifAbsent: [
1212
"try -Pharo40-"
1313
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
14-
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ]
14+
"try -Pharo50-"
15+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
16+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ]

repository/Grease-Core.package/GRPackage.class/methodProperties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"name" : "lr 2/17/2010 15:18",
1919
"name:" : "lr 10/25/2009 11:26",
2020
"printOn:" : "merged 10/20/2008 09:24",
21-
"resolveWith:" : "jok 8/23/2014 10:59",
21+
"resolveWith:" : "JohanBrichau 3/26/2016 15:54",
2222
"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
2323
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
2424
"seasideUrl" : "pmm 9/12/2013 15:58",
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SystemOrganization addCategory: #'Grease-Core'!
2-
SystemOrganization addCategory: #'Grease-Core-Collections'!
3-
SystemOrganization addCategory: #'Grease-Core-Exceptions'!
4-
SystemOrganization addCategory: #'Grease-Core-Text'!
5-
SystemOrganization addCategory: #'Grease-Core-Utilities'!
2+
SystemOrganization addCategory: 'Grease-Core-Collections'!
3+
SystemOrganization addCategory: 'Grease-Core-Exceptions'!
4+
SystemOrganization addCategory: 'Grease-Core-Text'!
5+
SystemOrganization addCategory: 'Grease-Core-Utilities'!

repository/Grease-Core.package/monticello.meta/version

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

repository/Grease-GemStone-Core.package/Process.extension/instance/properties.st

Lines changed: 0 additions & 4 deletions
This file was deleted.

repository/Grease-GemStone-Core.package/Process.extension/methodProperties.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

repository/Grease-GemStone-Core.package/Process.extension/properties.json

Lines changed: 0 additions & 2 deletions
This file was deleted.

repository/Grease-GemStone-Core.package/monticello.meta/version

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tests/testTravisCI.sh

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)