Skip to content

Commit e5012fa

Browse files
authored
Merge pull request #116 from jecisc/p14
Enable Pharo 14 on CI
2 parents 98f1ab4 + 5693ccb commit e5012fa

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.github/workflows/continuous.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1010
strategy:
1111
matrix:
12-
smalltalk: [ Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12, Pharo64-13 ]
12+
smalltalk: [ Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12, Pharo64-13, Pharo64-14 ]
1313
name: ${{ matrix.smalltalk }}
1414
steps:
1515
- uses: actions/checkout@v4

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[![Pharo version](https://img.shields.io/badge/Pharo-11-%23aac9ff.svg)](https://pharo.org/download)
88
[![Pharo version](https://img.shields.io/badge/Pharo-12-%23aac9ff.svg)](https://pharo.org/download)
99
[![Pharo version](https://img.shields.io/badge/Pharo-13-%23aac9ff.svg)](https://pharo.org/download)
10+
[![Pharo version](https://img.shields.io/badge/Pharo-14-%23aac9ff.svg)](https://pharo.org/download)
1011

1112
Chanel is a code cleaner for Pharo.
1213

@@ -93,7 +94,7 @@ Thus, it should be safe to depend on a fixed major version and moving minor vers
9394
| Version | Compatible Pharo versions |
9495
|------------- |--------------------------- |
9596
| 1.x.x | Pharo 70, 80, 90, 10, 11 |
96-
| 2.x.x | Pharo 90, 10, 11, 12, 13 |
97+
| 2.x.x | Pharo 90, 10, 11, 12, 13, 14 |
9798

9899
## Contact
99100

src/Chanel-Pharo11Plus/ChanelCondenseMethodsCleaner.class.st

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ Class {
1414
{ #category : 'cleaning' }
1515
ChanelCondenseMethodsCleaner >> clean [
1616

17-
self configuration localMethods do: [ :cm |
18-
(RBRefactoryChangeFactory instance addMethodSource: (ReMethodSourceCleaner clean: cm sourceCode) in: cm origin) execute ]
17+
self configuration localMethods do: [ :cm | cm origin compile: (ReMethodSourceCleaner clean: cm sourceCode) ]
1918
]

src/Chanel/Chanel.class.st

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,21 @@ Chanel >> cleanUsing: cleaners [
154154

155155
{ #category : 'cleaning' }
156156
Chanel >> cleanWithSelectedCleaners: cleaners [
157-
TinyCurrentLogger
158-
value: self class logger
159-
during: [ self
160-
execute: [ UIManager default
161-
displayProgress: 'Running Chanel'
162-
from: 1
163-
to: cleaners size
164-
during: [ :bar |
165-
cleaners
166-
doWithIndex: [ :cleaner :index |
167-
bar
168-
value: index;
169-
title: '(' , index asString , '/' , cleaners size asString , ') Running ' , cleaner printString.
170-
self execute: [ (cleaner configuration: self) clean ] recordedAs: 'Running ' , cleaner printString ] ] ]
171-
recordedAs: 'Running Chanel on: ' , (', ' join: (packages collect: #name)) ]
157+
158+
TinyCurrentLogger value: self class logger during: [
159+
self
160+
execute: [
161+
[ :bar |
162+
cleaners doWithIndex: [ :cleaner :index |
163+
bar
164+
value: index;
165+
title: '(' , index asString , '/' , cleaners size asString , ') Running ' , cleaner printString.
166+
self execute: [ (cleaner configuration: self) clean ] recordedAs: 'Running ' , cleaner printString ] ] asJob
167+
title: 'Running Chanel';
168+
min: 1;
169+
max: cleaners size;
170+
run ]
171+
recordedAs: 'Running Chanel on: ' , (', ' join: (packages collect: #name)) ]
172172
]
173173

174174
{ #category : 'accessing' }

0 commit comments

Comments
 (0)