Merge pull request #60 from ba-st/improve_gs_compatibility

Improve GS64 compatibility
ba-st · Apr 4, 2024 · f46dc98 · f46dc98
2 parents 9442c21 + bce4d50
commit f46dc98
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 37 deletions.
diff --git a/source/.properties b/source/.properties
@@ -1,4 +1,5 @@
 {
 	#format : #tonel,
+	#version: '3.0',
 	#convention : 'Rowan'
 }
diff --git a/source/BaselineOfLaunchpad/BaselineOfLaunchpad.class.st b/source/BaselineOfLaunchpad/BaselineOfLaunchpad.class.st
@@ -1,21 +1,24 @@
 Class {
-	#name : #BaselineOfLaunchpad,
-	#superclass : #BaselineOf,
-	#category : #BaselineOfLaunchpad
+	#name : 'BaselineOfLaunchpad',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfLaunchpad',
+	#package : 'BaselineOfLaunchpad'
 }
 
-{ #category : #'post-load actions' }
-BaselineOfLaunchpad >> addLaunchpadLogRecordAsGlobal [
+{ #category : 'post-load actions' }
+BaselineOfLaunchpad >> addLaunchpadLogRecordAsGlobalAndConfigureTransientClasses [
 
-	Smalltalk at: #LaunchpadLogRecord put: LogRecord
+	Smalltalk at: #LaunchpadLogRecord put: LogRecord.
+	LaunchpadApplication makeInstancesDbTransient.
+	CurrentlyRunningLaunchpadApplication makeInstancesDbTransient
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> baseline: spec [
 
 	<baseline>
 	spec for: #pharo do: [
-		spec postLoadDoIt: #addLaunchpadLogRecordAsGlobal.
+		spec postLoadDoIt: #addLaunchpadLogRecordAsGlobalAndConfigureTransientClasses.
 		self
 			setUpDependencies: spec;
 			setUpPackages: spec.
@@ -33,7 +36,7 @@ BaselineOfLaunchpad >> baseline: spec [
 		spec preLoadDoIt: #closeWelcomeWindow ]
 ]
 
-{ #category : #'post-load actions' }
+{ #category : 'post-load actions' }
 BaselineOfLaunchpad >> closeWelcomeWindow [
 	"Workaround for https://github.com/pharo-project/pharo/issues/13788"
 
@@ -44,13 +47,13 @@ BaselineOfLaunchpad >> closeWelcomeWindow [
 	Smalltalk garbageCollect
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 BaselineOfLaunchpad >> projectClass [
 
 	^ MetacelloCypressBaselineProject
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpDependencies: spec [
 
 	spec
@@ -75,7 +78,7 @@ BaselineOfLaunchpad >> setUpDependencies: spec [
 		with: [ spec loads: 'Dependent-SUnit-Extensions' ]
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpDeploymentPackages: spec [
 
 	spec
@@ -117,15 +120,15 @@ BaselineOfLaunchpad >> setUpDeploymentPackages: spec [
 		group: 'Deployment' with: 'Launchpad-Tracing'
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpExamplePackages: spec [
 
 	spec
 		package: 'Launchpad-Examples' with: [ spec requires: 'Deployment' ];
 		group: 'Examples' with: #( 'Deployment' 'Launchpad-Examples' )
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpPackages: spec [
 
 	self
@@ -137,7 +140,7 @@ BaselineOfLaunchpad >> setUpPackages: spec [
 	spec group: 'Tools' with: 'Buoy-Tools'
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpPharo10Packages: spec [
 
 	spec
@@ -151,16 +154,21 @@ BaselineOfLaunchpad >> setUpPharo10Packages: spec [
 		group: 'Tools' with: 'Launchpad-Development-Tools'
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpPharo11Packages: spec [
 
 	spec
 		package: 'Launchpad-Tracing-Fuel' with: [ spec requires: 'Launchpad-Tracing' ];
 		group: 'Deployment' with: 'Launchpad-Tracing-Fuel';
-		group: 'Tests' with: 'Launchpad-Tracing-Fuel'
+		group: 'Tests' with: 'Launchpad-Tracing-Fuel'.
+
+	spec
+		package: 'Launchpad-Development-Tools'
+		with: [ spec requires: #( 'Launchpad-Applications' 'Launchpad-Configuration' ) ];
+		group: 'Tools' with: 'Launchpad-Development-Tools'
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpPharo8Packages: spec [
 
 	spec
@@ -173,7 +181,7 @@ BaselineOfLaunchpad >> setUpPharo8Packages: spec [
 		group: 'Deployment' with: 'Launchpad-Tracing-Pharo8'
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpPharo9Packages: spec [
 
 	spec
@@ -182,7 +190,7 @@ BaselineOfLaunchpad >> setUpPharo9Packages: spec [
 		group: 'Tests' with: 'Launchpad-Tracing-Fuel-Legacy'
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpSUnitPackages: spec [
 
 	spec
@@ -192,7 +200,7 @@ BaselineOfLaunchpad >> setUpSUnitPackages: spec [
 		group: 'Dependent-SUnit-Extensions' with: 'Launchpad-SUnit'
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfLaunchpad >> setUpTestPackages: spec [
 
 	spec

diff --git a/source/BaselineOfLaunchpad/VersionFromRepositoryResolver.class.st b/source/BaselineOfLaunchpad/VersionFromRepositoryResolver.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #VersionFromRepositoryResolver,
-	#superclass : #Object,
-	#category : #BaselineOfLaunchpad
+	#name : 'VersionFromRepositoryResolver',
+	#superclass : 'Object',
+	#category : 'BaselineOfLaunchpad',
+	#package : 'BaselineOfLaunchpad'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 VersionFromRepositoryResolver >> valueFor: projectName [
 
 	| packageName version |
@@ -21,7 +22,7 @@ VersionFromRepositoryResolver >> valueFor: projectName [
 	^ version
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 VersionFromRepositoryResolver >> versionFromGitRepository: repository [
 
 	| projectCommitish |
@@ -40,7 +41,7 @@ VersionFromRepositoryResolver >> versionFromGitRepository: repository [
 		  ]
 ]
 
-{ #category : #private }
+{ #category : 'private' }
 VersionFromRepositoryResolver >> versionFromMonticelloRepository: aPackageName [
 
 	self class environment at: #MCWorkingCopy ifPresent: [ :workingCopy | 

diff --git a/source/BaselineOfLaunchpad/package.st b/source/BaselineOfLaunchpad/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfLaunchpad }
+Package { #name : 'BaselineOfLaunchpad' }
diff --git a/source/Launchpad-Applications/CurrentlyRunningLaunchpadApplication.class.st b/source/Launchpad-Applications/CurrentlyRunningLaunchpadApplication.class.st
@@ -7,14 +7,14 @@ Class {
 	#classVars : [
 		'uniqueInstance'
 	],
-	#gs_options : [
-		'dbTransient'
-	],
 	#category : 'Launchpad-Applications',
-	#package : 'Launchpad-Applications'
+	#package : 'Launchpad-Applications',
+	#'gs_options' : [
+		'dbTransient'
+	]
 }
 
-{ #category : 'initialization' }
+{ #category : 'class initialization' }
 CurrentlyRunningLaunchpadApplication class >> initialize [
 
 	<ignoreForCoverage>

diff --git a/source/Launchpad-Applications/LaunchpadApplication.class.st b/source/Launchpad-Applications/LaunchpadApplication.class.st
@@ -7,11 +7,11 @@ Class {
 		'mode',
 		'commandServer'
 	],
-	#gs_options : [
-		'dbTransient'
-	],
 	#category : 'Launchpad-Applications',
-	#package : 'Launchpad-Applications'
+	#package : 'Launchpad-Applications',
+	#'gs_options' : [
+		'dbTransient'
+	]
 }
 
 { #category : 'accessing' }