X Tutup
Skip to content

Commit 71b081c

Browse files
author
Johan Brichau
committed
Merge pull request SeasideSt#5 from GsDevKit/dev-1.1.11
Dev 1.1.11
2 parents bc87401 + f2bc124 commit 71b081c

File tree

54 files changed

+152
-76
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+152
-76
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
- ST=Squeak-4.4 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
99
- ST=GemStone-2.4.4.2 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
1010
- ST=GemStone-3.1.0.6 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
11-
- ST=GemStone-3.2.0 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
11+
- ST=GemStone-3.2.2 BASELINE=Grease LOADS="'Tests'" REPOSITORY="filetree://${TRAVIS_BUILD_DIR}/repository"
1212

1313
install:
1414
- export PROJECT_HOME="$(pwd)"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
convenience
22
decode: aString
3-
"Overridden for efficencey."
3+
"Overridden for efficiency."
44

55
^ aString
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
convenience
22
encode: aString
3-
"Overridden for efficencey."
3+
"Overridden for efficiency."
44

55
^ aString

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"codecs" : "jf 2/7/2009 20:27",
66
"supportsEncoding:" : "lr 7/25/2011 19:46" },
77
"instance" : {
8-
"decode:" : "lr 2/7/2009 11:50",
8+
"decode:" : "pmm 8/19/2014 10:00",
99
"decoderFor:" : "jf 9/30/2009 00:28",
10-
"encode:" : "lr 2/7/2009 11:50",
10+
"encode:" : "pmm 8/19/2014 10:00",
1111
"encoderFor:" : "jf 9/30/2009 00:28",
1212
"name" : "pmm 5/26/2010 07:07",
1313
"url" : "lr 2/7/2009 12:06" } }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ resolveWith: aDictionary
44
collect: [ :each |
55
aDictionary at: each ifAbsent: [
66
"if Foo-Pharo-Bar fails try Foo-Pharo20-Bar and Foo-Pharo30-Bar"
7-
(each indexOfSubCollection: '-Pharo-' startingAt: 0) ~= 0 ifTrue: [
7+
(each indexOfSubCollection: '-Pharo-' startingAt: 1) ~= 0 ifTrue: [
88
"try -Pharo20-"
99
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo20-') ifAbsent: [
1010
"try -Pharo30-"
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+
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:" : "StephanEggermont 7/2/2014 19:02",
21+
"resolveWith:" : "jok 8/23/2014 10:59",
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
exceptions
22
deprecationExceptionSet
33
"Answer the exception set that should considered besides WADeprecation."
4-
^#()
4+
^ ExceptionSet new

repository/Grease-Core.package/GRPlatform.class/instance/localNameOf..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
file library
22
localNameOf: aFilename
3-
"Answer the local name of a file indentified by an absolute file path.
3+
"Answer the local name of a file identified by an absolute file path.
44
55
Eg.
66
If the platform is Windwos and aFilename is 'C:\Windows\win32.dll' then it would answer 'win32.dll'.

repository/Grease-Core.package/GRPlatform.class/instance/version.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ version info
22
version
33
"Answer the Grease version"
44

5-
^ (GRVersion major: 1 minor: 1 revision: 9)
5+
^ (GRVersion major: 1 minor: 1 revision: 10)
66
yourself
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
file library
22
write: aStringOrByteArray toFile: aFileNameString inFolder: aFolderString
3-
"Write aStringOrByteArray to a file named aFilenameString in the folder aFolderString."
3+
"Write aStringOrByteArray to a file named aFileNameString in the folder aFolderString."
44
self subclassResponsibility

0 commit comments

Comments
 (0)
X Tutup