Skip to content

Commit

Permalink
Update tonel dependency to Pharo12 branch
Browse files Browse the repository at this point in the history
During the development of Pharo 12 we will bring some changes to tonel such as an improved way to deal with packages and tags and maybe a way to set the deprecated aliases of a class. 

This change make Iceberg depend on the branch Pharo12 of the tonel repository. 

This branch has one change ahead of the master branch that is the introduction of TonelWriterV3. This new writer will export the package and the tag of classes on top of the category. 
It also update the reader to be able to read this new format and try to be as backward compatible as possible.
  • Loading branch information
jecisc committed Sep 14, 2023
1 parent 4dd8b89 commit 1037988
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
27 changes: 14 additions & 13 deletions BaselineOfIceberg/BaselineOfIceberg.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
Baseline for https://github.com/pharo-vcs/iceberg project
"
Class {
#name : #BaselineOfIceberg,
#superclass : #BaselineOf,
#category : #BaselineOfIceberg
#name : 'BaselineOfIceberg',
#superclass : 'BaselineOf',
#category : 'BaselineOfIceberg',
#package : 'BaselineOfIceberg'
}

{ #category : #baseline }
{ #category : 'baseline' }
BaselineOfIceberg >> baseline: spec [
<baseline>

Expand Down Expand Up @@ -63,14 +64,14 @@ BaselineOfIceberg >> baseline: spec [

]

{ #category : #accessing }
{ #category : 'accessing' }
BaselineOfIceberg >> customProjectAttributes [
Smalltalk os isMacOS ifTrue: [ ^ #(#MacOS) ].
Smalltalk os isUnix ifTrue: [ ^ #(#Unix) ].
Smalltalk os isWindows ifTrue: [ ^ #(#Windows) ]
]

{ #category : #baseline }
{ #category : 'baseline' }
BaselineOfIceberg >> libgit: spec [
spec
baseline: 'LibGit'
Expand All @@ -84,14 +85,14 @@ BaselineOfIceberg >> libgit: spec [
with: [ spec loads: #('tests') ]
]

{ #category : #script }
{ #category : 'script' }
BaselineOfIceberg >> postLoad [

self resetKMRepository.
(Smalltalk at: #Iceberg) bootstrap
]

{ #category : #script }
{ #category : 'script' }
BaselineOfIceberg >> postLoadWithDirective: aDirective projectSpec: aSpec [
| repository |
self resetKMRepository.
Expand All @@ -108,7 +109,7 @@ BaselineOfIceberg >> postLoadWithDirective: aDirective projectSpec: aSpec [
packageList: aSpec packageNames
]

{ #category : #accessing }
{ #category : 'accessing' }
BaselineOfIceberg >> projectClass [
^ super projectClass
"this is breaking the bootstrap. Reverting it for now."
Expand All @@ -117,23 +118,23 @@ BaselineOfIceberg >> projectClass [
do: [ super projectClass ]"
]

{ #category : #script }
{ #category : 'script' }
BaselineOfIceberg >> resetKMRepository [
Smalltalk
at: #KMRepository
ifPresent: [ :class | class reset ]
]

{ #category : #baseline }
{ #category : 'baseline' }
BaselineOfIceberg >> ring2: spec [
spec
baseline: 'Ring2'
with: [ spec repository: 'github://guillep/Ring2:v2.0.0/src' ]
]

{ #category : #baseline }
{ #category : 'baseline' }
BaselineOfIceberg >> tonel: spec [
spec
baseline: 'Tonel'
with: [ spec repository: 'github://pharo-vcs/tonel:v1.0.19' ]
with: [ spec repository: 'github://pharo-vcs/tonel:Pharo12' ]
]
2 changes: 1 addition & 1 deletion BaselineOfIceberg/package.st
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Package { #name : #BaselineOfIceberg }
Package { #name : 'BaselineOfIceberg' }

0 comments on commit 1037988

Please sign in to comment.