From 10379883299abad6a97f7b2dfff36fb9c5010555 Mon Sep 17 00:00:00 2001
From: CyrilFerlicot <cyril@ferlicot.me>
Date: Thu, 14 Sep 2023 14:25:36 +0200
Subject: [PATCH] Update tonel dependency to Pharo12 branch

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.
---
 BaselineOfIceberg/BaselineOfIceberg.class.st | 27 ++++++++++----------
 BaselineOfIceberg/package.st                 |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st
index f69d9bdebe..d19e7757d9 100644
--- a/BaselineOfIceberg/BaselineOfIceberg.class.st
+++ b/BaselineOfIceberg/BaselineOfIceberg.class.st
@@ -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>
 	
@@ -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' 
@@ -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.
@@ -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."
@@ -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' ]
 ]
diff --git a/BaselineOfIceberg/package.st b/BaselineOfIceberg/package.st
index 14d75ed14c..83d7134234 100644
--- a/BaselineOfIceberg/package.st
+++ b/BaselineOfIceberg/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfIceberg }
+Package { #name : 'BaselineOfIceberg' }