X Tutup
Skip to content

Sync GsDevKit>>Grease with SeasideSt>>Grease master#12

Merged
jbrichau merged 91 commits intoGsDevKit:masterfrom
SeasideSt:master
Nov 27, 2018
Merged

Sync GsDevKit>>Grease with SeasideSt>>Grease master#12
jbrichau merged 91 commits intoGsDevKit:masterfrom
SeasideSt:master

Conversation

@jbrichau
Copy link
Member

To release Seaside 3.3, I need GsDevKit>>Grease to have the latest code. In particular, the move of GsContext from Seaside-Gemstone-Core to Grease-Gemstone-Core requires this.

Johan Brichau and others added 30 commits May 26, 2017 12:10
…ariable

Add GRNotificationBasedDynamicVariable
…Stone to better reflect why we override it.
… expected semantics (see method comments for details)
…orrectly implement expected semantics (see method comments for details)
A couple of small optimizations
Merge branch 'master' into dev

# Conflicts:
#	repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/instance/testDefaultValue.st
Improve travis builds (remove caching where it breaks)
Fix Symbol >> #greaseString
Add missing collection methods to GRSmallDictionary
Johan Brichau and others added 25 commits July 26, 2018 08:56
Addresses Pharo70 incompatibilities:
Merged changes to master (concerning Pharo 7) into dev branch
…d implemented GRGemStonePlatform>>thisContext
Use latest Metacello for Pharo 3 and 4
… we are loading and testing again for these platform versions
# Conflicts:
#	.travis.yml
#	README.md
#	repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st
#	repository/Grease-Core.package/Character.extension/methodProperties.json
#	repository/Grease-Core.package/GRBoundMessage.class/methodProperties.json
#	repository/Grease-Core.package/GRCodec.class/methodProperties.json
#	repository/Grease-Core.package/GRCodecStream.class/methodProperties.json
#	repository/Grease-Core.package/GRCountingStream.class/methodProperties.json
#	repository/Grease-Core.package/GRDelayedSend.class/methodProperties.json
#	repository/Grease-Core.package/GRDelayedSendMessage.class/methodProperties.json
#	repository/Grease-Core.package/GRDelegatingStream.class/methodProperties.json
#	repository/Grease-Core.package/GRDeprecatedApiNotification.class/methodProperties.json
#	repository/Grease-Core.package/GRError.class/methodProperties.json
#	repository/Grease-Core.package/GRInflector.class/methodProperties.json
#	repository/Grease-Core.package/GRInvalidArgumentCount.class/methodProperties.json
#	repository/Grease-Core.package/GRInvalidUtf8Error.class/methodProperties.json
#	repository/Grease-Core.package/GRMappedPrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRNotification.class/methodProperties.json
#	repository/Grease-Core.package/GRNullCodec.class/methodProperties.json
#	repository/Grease-Core.package/GRNullCodecStream.class/methodProperties.json
#	repository/Grease-Core.package/GRNumberPrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRObject.class/methodProperties.json
#	repository/Grease-Core.package/GROrderedMultiMap.class/methodProperties.json
#	repository/Grease-Core.package/GROrderedMultiMap2.class/methodProperties.json
#	repository/Grease-Core.package/GROrdinalizePrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRPackage.class/methodProperties.json
#	repository/Grease-Core.package/GRPlatform.class/methodProperties.json
#	repository/Grease-Core.package/GRPluggablePrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRPrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRSequentialPrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRSignPrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRSmallDictionary.class/methodProperties.json
#	repository/Grease-Core.package/GRSmallDictionary2.class/methodProperties.json
#	repository/Grease-Core.package/GRSmallOrderedSet.class/methodProperties.json
#	repository/Grease-Core.package/GRStringPrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRUnboundMessage.class/methodProperties.json
#	repository/Grease-Core.package/GRUnitPrinter.class/methodProperties.json
#	repository/Grease-Core.package/GRUnsupportedEncodingError.class/methodProperties.json
#	repository/Grease-Core.package/GRVersion.class/methodProperties.json
#	repository/Grease-Core.package/Integer.extension/methodProperties.json
#	repository/Grease-Core.package/Number.extension/methodProperties.json
#	repository/Grease-Core.package/Object.extension/methodProperties.json
#	repository/Grease-Core.package/String.extension/methodProperties.json
#	repository/Grease-Core.package/UndefinedObject.extension/methodProperties.json
#	repository/Grease-Core.package/monticello.meta/version
#	repository/Grease-Pharo70-Core.package/monticello.meta/version
@jbrichau jbrichau requested a review from dalehenrich November 24, 2018 09:31
Copy link
Member

@dalehenrich dalehenrich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good ...

@jbrichau jbrichau merged commit cbf6d30 into GsDevKit:master Nov 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

X Tutup