From 48291cdfb7f0114bd27a7af07f648512fc15e848 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Mon, 13 Nov 2023 17:01:16 +0100 Subject: [PATCH 1/3] Small cleanups - MetacelloPharoPlatform got deprecated: fix IceMetacelloPharoPlatform - Remove dead code marking lot of classes as abstract wrongly :( --- .../IceBitbucketRepositoryType.class.st | 10 +++-- .../IceGitLocalRepositoryType.class.st | 16 ++++---- .../IceGitRepositoryType.class.st | 12 +++--- .../IceGithubRepositoryType.class.st | 12 +++--- .../IceGitlabRepositoryType.class.st | 10 +++-- .../IceMetacelloLoadChoice.class.st | 26 +++++++------ .../IceMetacelloLoadSession.class.st | 14 ++++--- .../IceMetacelloLoadSessionContext.class.st | 8 ++-- .../IceMetacelloPharoPlatform.class.st | 18 +++++---- .../IceMetacelloRepositoryType.class.st | 32 ++++++++-------- .../IceProviderRepositoryType.class.st | 20 +++++----- .../IceRepository.extension.st | 4 +- .../MCGitRemoteRepository.class.st | 38 ++++++++++--------- ...nifestIcebergMetacelloIntegration.class.st | 10 +++-- .../MetacelloPlatform.extension.st | 4 +- .../MetacelloScriptApiExecutor.extension.st | 4 +- Iceberg-Metacello-Integration/package.st | 2 +- Iceberg/MCDefinition.extension.st | 6 --- Iceberg/MCMethodDefinition.extension.st | 5 --- 19 files changed, 133 insertions(+), 118 deletions(-) diff --git a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st index 9f4ffef342..fb260621cb 100644 --- a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Bitbucket repositories " Class { - #name : #IceBitbucketRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceBitbucketRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceBitbucketRepositoryType class >> type [ ^ 'bitbucket' ] diff --git a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st index 1c2f49f152..bf150ca7e2 100644 --- a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st @@ -20,22 +20,24 @@ Metacello new " Class { - #name : #IceGitLocalRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitLocalRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType class >> type [ ^ 'gitlocal' ] -{ #category : #testing } +{ #category : 'testing' } IceGitLocalRepositoryType >> isGitRoot: aReference [ ^ IceRepositoryCreator isGitRoot: aReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType >> mcRepository [ | repository tuple extractedLocation | @@ -57,7 +59,7 @@ IceGitLocalRepositoryType >> mcRepository [ ^ repository metacelloAdapter: repository head description. ] -{ #category : #private } +{ #category : 'private' } IceGitLocalRepositoryType >> splitRootAndSubdirectoryFromLocation [ | root subDir | (self location beginsWith: (self class type, '://')) diff --git a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st index d8f91b3b32..2b2b031127 100644 --- a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st @@ -7,18 +7,20 @@ git:https://github.com/user/project.git git:git@github.com:user/project.git " Class { - #name : #IceGitRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType class >> type [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType >> mcRepositoryClass [ ^ MCGitRemoteRepository diff --git a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st index 3d42910506..00b3bf513c 100644 --- a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st @@ -2,17 +2,19 @@ I resolve Github repositories " Class { - #name : #IceGithubRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGithubRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType class >> type [ ^ 'github' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType >> mcRepository [ | baseRepo | diff --git a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st index 597dcee6da..620b0f0811 100644 --- a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Gilab repositories " Class { - #name : #IceGitlabRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitlabRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitlabRepositoryType class >> type [ ^ 'gitlab' ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st index 3ab968801a..2f7b4b760e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st @@ -3,60 +3,62 @@ I'm a recorded choice when installing a metacello baseline/configuration. A choice is created whenever there is a conflict between two project versions (loaded and incomming). Due the nature of Matacello, this choice can be asked several times... A choice keeps track of what user selected to avoid asking him every time. " Class { - #name : #IceMetacelloLoadChoice, - #superclass : #Object, + #name : 'IceMetacelloLoadChoice', + #superclass : 'Object', #instVars : [ 'projectName', 'optionA', 'optionB', 'choosen' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen [ ^ choosen ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen: anObject [ choosen := anObject ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloLoadChoice >> isChoiceBetween: firstOption and: secondOption [ ^ (self optionA = firstOption) and: [ self optionB = secondOption ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA [ ^ optionA ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA: anObject [ optionA := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB [ ^ optionB ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB: anObject [ optionB := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st index 71cd94a286..1e0f8d7831 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st @@ -5,28 +5,30 @@ I will be active during the context of a ""metacello load"" command, and it will Tipically, I will be used to keep some state needed during the full execution, like a choice of what whas selected when conflicting or upgraded versions acts. " Class { - #name : #IceMetacelloLoadSession, - #superclass : #Object, + #name : 'IceMetacelloLoadSession', + #superclass : 'Object', #instVars : [ 'choices' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloLoadSession >> initialize [ super initialize. choices := Set new ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoice: anIceMetacelloLoadChoice [ ^ choices add: anIceMetacelloLoadChoice ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoiceProject: projectName optionA: optionA optionB: optionB ifAbsentAnswer: aBlock [ ^ choices diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st index 20c708ea70..ff4a76cf1a 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st @@ -2,7 +2,9 @@ I'm a dynamic variable to keep a load session. " Class { - #name : #IceMetacelloLoadSessionContext, - #superclass : #DynamicVariable, - #category : #'Iceberg-Metacello-Integration-Session' + #name : 'IceMetacelloLoadSessionContext', + #superclass : 'DynamicVariable', + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index 84a2c88bbf..e1fdfb097e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -2,23 +2,25 @@ I'm a class to add support for iceberg to metacello. " Class { - #name : #IceMetacelloPharoPlatform, - #superclass : #MetacelloPharoPlatform, - #category : #'Iceberg-Metacello-Integration-Platform' + #name : 'IceMetacelloPharoPlatform', + #superclass : 'MetacelloPlatform', + #category : 'Iceberg-Metacello-Integration-Platform', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Platform' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceMetacelloPharoPlatform class >> initialize [ self select ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloPharoPlatform >> canHandleType: type [ ^ Iceberg enableMetacelloIntegration and: [ IceMetacelloRepositoryType canHandleType: type ] ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ (self canHandleType: aRepositorySpec type) ifTrue: [ ^ Iceberg mcRepositoryFor: aRepositorySpec description ]. @@ -26,7 +28,7 @@ IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ ^ super createRepository: aRepositorySpec ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ (description beginsWith: 'ftp://') ifTrue: [ ^'ftp' ]. @@ -36,7 +38,7 @@ IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ ^ super extractTypeFromDescription: description ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceMetacelloPharoPlatform >> withMetacelloLoadSessionDo: aBlock [ | context | diff --git a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st index ad7653c809..57f5b0a2c1 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st @@ -3,21 +3,23 @@ I'm a base class to provide different type of MCRepositories from iceberg, so me My children define specific types, visit them to have more details of what you can do. " Class { - #name : #IceMetacelloRepositoryType, - #superclass : #Object, + #name : 'IceMetacelloRepositoryType', + #superclass : 'Object', #instVars : [ 'location' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> allTypes [ ^ self allSubclasses reject: [ :each | each isAbstract ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> canHandleType: aType [ ^ self allTypes @@ -25,35 +27,35 @@ IceMetacelloRepositoryType class >> canHandleType: aType [ ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> extractTypeOf: aString [ ^ aString copyUpTo: $: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMetacelloRepositoryType class >> for: aLocationString [ ^ (self allTypes detect: [ :each | each isSuitableForLocation: aLocationString ]) location: aLocationString ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isAbstract [ ^ self = IceMetacelloRepositoryType ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForLocation: aLocationString [ ^ self isSuitableForType: (self extractTypeOf: aLocationString) ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForType: aType [ ^ self type = aType ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> location: aLocationString [ self = IceMetacelloRepositoryType ifTrue: [ self error: 'I''m an abstract class, use one of my children instead.' ]. @@ -63,23 +65,23 @@ IceMetacelloRepositoryType class >> location: aLocationString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> type [ ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloRepositoryType >> initializeLocation: aString [ location := aString. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> mcRepository [ self subclassResponsibility ] diff --git a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st index ae7b35ddbb..4036cf4c81 100644 --- a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st @@ -20,18 +20,20 @@ Metacello new load: 'mongo tests'. " Class { - #name : #IceProviderRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceProviderRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #testing } +{ #category : 'testing' } IceProviderRepositoryType class >> isAbstract [ ^ super isAbstract or: [ self = IceProviderRepositoryType ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> guessRegisteredRepository [ "I get the project name and try to find it into the already registered projects. If I find it, I will use this instead cloning a new one." @@ -41,7 +43,7 @@ IceProviderRepositoryType >> guessRegisteredRepository [ ifNone: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepository [ | baseRepo | @@ -55,7 +57,7 @@ IceProviderRepositoryType >> mcRepository [ ^ baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepositoryClass [ ^ (MCGitBasedNetworkRepository allSubclasses @@ -63,13 +65,13 @@ IceProviderRepositoryType >> mcRepositoryClass [ detect: [ :each | each basicDescription = self class type ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectName [ ^ (self location substrings: '/') third copyUpTo: $: ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectVersion [ ^ (location substrings: '/') third copyAfter: $: diff --git a/Iceberg-Metacello-Integration/IceRepository.extension.st b/Iceberg-Metacello-Integration/IceRepository.extension.st index fcb43e92a5..e9f60ebc90 100644 --- a/Iceberg-Metacello-Integration/IceRepository.extension.st +++ b/Iceberg-Metacello-Integration/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } IceRepository >> metacelloAdapter: version [ ^ IceMetacelloRepositoryAdapter for: self withVersion: version ] diff --git a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st index a698e9d6d7..6874e90140 100644 --- a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st +++ b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st @@ -9,30 +9,32 @@ git@github.com:user/project.git WARNING: This repository is meant to be used with iceberg and it will not work with plain Monticello/Metacello (because there is no way to know how to download a zip) " Class { - #name : #MCGitRemoteRepository, - #superclass : #MCGitBasedNetworkRepository, + #name : 'MCGitRemoteRepository', + #superclass : 'MCGitBasedNetworkRepository', #instVars : [ 'host', 'port', 'path', 'user' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> basicDescription [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> description [ ^ self basicDescription , ':' ] -{ #category : #private } +{ #category : 'private' } MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ ^ self new @@ -40,13 +42,13 @@ MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> host [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> httpsUrl [ ^ 'https://{1}{2}/{3}.git' format: { @@ -57,13 +59,13 @@ MCGitRemoteRepository >> httpsUrl [ self path } ] -{ #category : #initialization } +{ #category : 'initialization' } MCGitRemoteRepository >> initialize [ super initialize. ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseHTTPLocation: aString [ | url | @@ -73,7 +75,7 @@ MCGitRemoteRepository >> parseHTTPLocation: aString [ path := self pathFrom: url path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseLocation: aString [ (#('http:' 'https:') @@ -82,7 +84,7 @@ MCGitRemoteRepository >> parseLocation: aString [ ifFalse: [ self parseSSHLocation: aString ] ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseSSHLocation: aString [ | segments | @@ -92,13 +94,13 @@ MCGitRemoteRepository >> parseSSHLocation: aString [ path := self pathFrom: segments third ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> path [ ^ path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> pathFrom: aString [ ^ (aString endsWith: '.git') @@ -106,19 +108,19 @@ MCGitRemoteRepository >> pathFrom: aString [ ifFalse: [ aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> port [ ^ port ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> projectPath [ ^ self path ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> scpUrl [ ^ '{1}@{2}/{3}.git' format: { @@ -127,7 +129,7 @@ MCGitRemoteRepository >> scpUrl [ self path } ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> user [ ^ user diff --git a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st index db10aae91b..d60493f9b4 100644 --- a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st +++ b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergMetacelloIntegration, - #superclass : #PackageManifest, - #category : 'Iceberg-Metacello-Integration-Manifest' + #name : 'ManifestIcebergMetacelloIntegration', + #superclass : 'PackageManifest', + #category : 'Iceberg-Metacello-Integration-Manifest', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergMetacelloIntegration class >> description [ ^ 'I contains the code related to the Metacello integration of Iceberg. diff --git a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st index 6c833fb9fe..28bb44563a 100644 --- a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloPlatform } +Extension { #name : 'MetacelloPlatform' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloPlatform >> withMetacelloLoadSessionDo: aBlock [ aBlock value diff --git a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st index 00384fd4ac..74c3d4eb18 100644 --- a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloScriptApiExecutor } +Extension { #name : 'MetacelloScriptApiExecutor' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloScriptApiExecutor >> execute: statements [ MetacelloPlatform current withMetacelloLoadSessionDo: [ diff --git a/Iceberg-Metacello-Integration/package.st b/Iceberg-Metacello-Integration/package.st index c5a00f7fb1..228e3a9d15 100644 --- a/Iceberg-Metacello-Integration/package.st +++ b/Iceberg-Metacello-Integration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Metacello-Integration' } +Package { #name : 'Iceberg-Metacello-Integration' } diff --git a/Iceberg/MCDefinition.extension.st b/Iceberg/MCDefinition.extension.st index 8ffd5440ce..3ad3333f24 100644 --- a/Iceberg/MCDefinition.extension.st +++ b/Iceberg/MCDefinition.extension.st @@ -5,12 +5,6 @@ MCDefinition >> addAnalysisToPackageChangeSet: aPackageChangeSet change: aChange aPackageChangeSet addChange: aChange ] -{ #category : '*Iceberg-Changes' } -MCDefinition >> buildOn: anIceDiffBuilder [ - - self subclassResponsibility -] - { #category : '*Iceberg-changes' } MCDefinition >> isFileDefinition [ diff --git a/Iceberg/MCMethodDefinition.extension.st b/Iceberg/MCMethodDefinition.extension.st index 11c41461d0..a0ba563cce 100644 --- a/Iceberg/MCMethodDefinition.extension.st +++ b/Iceberg/MCMethodDefinition.extension.st @@ -1,10 +1,5 @@ Extension { #name : 'MCMethodDefinition' } -{ #category : '*Iceberg-Changes' } -MCMethodDefinition >> buildOn: anIcePackageDiff [ - self shouldBeImplemented. -] - { #category : '*Iceberg-Adapters' } MCMethodDefinition >> classCategory [ ^ self actualClass ifNotNil: #category ifNil: [ RPackage defaultPackageName ] From 01a152b1562f3ba2b8323fd4b5cb5abfff4b0086 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 17:37:56 +0100 Subject: [PATCH 2/3] Update IceMetacelloPharoPlatform.class.st --- .../IceMetacelloPharoPlatform.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index 693a3f9c08..f2c5092a3a 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -6,7 +6,7 @@ Class { #category : 'Iceberg-Metacello-Integration-Platform', #package : 'Iceberg-Metacello-Integration', #tag : 'Platform' - #name : 'IceMetacelloPharoPlatform', + #name : 'IceMetacelloPharoPlatform' } { #category : 'class initialization' } From 7f7054cf4d9737779815c9299060a404cf2d3c12 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Tue, 21 Nov 2023 17:40:08 +0100 Subject: [PATCH 3/3] Update IceMetacelloPharoPlatform.class.st --- .../IceMetacelloPharoPlatform.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index f2c5092a3a..e1fdfb097e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -2,11 +2,11 @@ I'm a class to add support for iceberg to metacello. " Class { + #name : 'IceMetacelloPharoPlatform', #superclass : 'MetacelloPlatform', #category : 'Iceberg-Metacello-Integration-Platform', #package : 'Iceberg-Metacello-Integration', #tag : 'Platform' - #name : 'IceMetacelloPharoPlatform' } { #category : 'class initialization' }