diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e14adcf8..6205cce2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -13,7 +13,7 @@ jobs: include: - smalltalk: Pharo64-13 experimental: true - - smalltalk: GToolkit64-release + - smalltalk: GToolkit64-release experimental: true - smalltalk: Squeak64-6.0 experimental: true diff --git a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st index 9b0dc1d36..b4ac5843a 100644 --- a/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st +++ b/repository/Seaside-Pharo-Development.package/WADevelopment.class/class/ensureAuthorInitialsWith..st @@ -7,7 +7,8 @@ ensureAuthorInitialsWith: aOneArgumentBlock ifTrue: [ "Special Pharo code path to avoid deprecation" | author | - author := Smalltalk at: #Author. + SystemVersion current major >= 13 ifTrue:[ ^ self. "do nothing because Author does not exist anymore" ]. + author := Smalltalk at: #Author ifAbsent: [ nil ]. author isNil ifTrue: [ ^ self error: 'unsupported Pharo version' ]. author fullNamePerSe isEmptyOrNil diff --git a/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideIsAuthorNameSet.st b/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideIsAuthorNameSet.st index 25e394870..b305eb31d 100644 --- a/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideIsAuthorNameSet.st +++ b/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideIsAuthorNameSet.st @@ -1,3 +1,5 @@ *seaside-pharo-welcome seasideIsAuthorNameSet - ^ Author fullNamePerSe isEmptyOrNil not \ No newline at end of file + + SystemVersion current major >= 13 ifTrue:[ ^ true. "Author does not exist anymore" ]. + ^ (Smalltalk at: #Author) fullNamePerSe isEmptyOrNil not \ No newline at end of file diff --git a/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st b/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st index 5f7a84cad..98a40c20c 100644 --- a/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st +++ b/repository/Seaside-Pharo-Welcome.package/GRPharoPlatform.extension/instance/seasideSetAuthorName..st @@ -1,3 +1,5 @@ *seaside-pharo-welcome seasideSetAuthorName: anAuthorName - Author fullName: anAuthorName \ No newline at end of file + + SystemVersion current major >= 13 ifTrue:[ ^ self error: 'Author does not exist anymore.' ]. + (Smalltalk at: #Author) fullName: anAuthorName \ No newline at end of file diff --git a/repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/menuCommandOn..st b/repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st similarity index 68% rename from repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/menuCommandOn..st rename to repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st index 7ca6d9052..ceaff0471 100644 --- a/repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/menuCommandOn..st +++ b/repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/controlPanelMenuCommandOn..st @@ -1,10 +1,10 @@ world menu -menuCommandOn: aBuilder +controlPanelMenuCommandOn: aBuilder - self registerIcons. + (aBuilder item: #ServerAdapterBrowser) - order: 0.21; - parent: #Tools; + order: 1; + parent: #Seaside; label: 'Seaside Control Panel'; icon: (self iconNamed: #adaptorRunningIcon); action: [ self open ] \ No newline at end of file diff --git a/repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st b/repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st new file mode 100644 index 000000000..47b284ae7 --- /dev/null +++ b/repository/Seaside-Pharo100-Tools-Spec2.package/WAPharoControlPanel.class/class/runSeleniumServerInTerminal.st @@ -0,0 +1,6 @@ +commands +runSeleniumServerInTerminal +