Skip to content

Commit

Permalink
Merge pull request #1351 from tesonep/1349-crLog-method-missing
Browse files Browse the repository at this point in the history
Fixing errors after the deprecation of PluggableTextField
  • Loading branch information
tesonep authored Mar 2, 2020
2 parents a983e7c + 2590f80 commit d1f73bd
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ os:
smalltalk:
- Pharo32-8.0
- Pharo64-8.0
- Pharo32-7.0
- Pharo64-7.0
- Pharo32-9.0
- Pharo64-9.0

env:
matrix:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Class {
'selectRemoteModel',
'currentWaitingProcess'
],
#category : 'Iceberg-Plugin-GitHub-View'
#category : #'Iceberg-Plugin-GitHub-View'
}

{ #category : #specs }
Expand Down Expand Up @@ -111,7 +111,7 @@ IceGitHubNewBranchFromIssuePanel >> initializeWidgetsContents [
whenBuiltDo: [ :w |
w widget wrapFlag: false.
w widget enabled: false ].
issueNumberText textHolder whenChangedDo: [ :text | self validateIssue: text ]
issueNumberText textHolder whenChangedDo: [ :text | self validateIssue: text asString ]
]

{ #category : #'accessing ui' }
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-Tests/IceGitTestFactory.class.st
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Class {
#name : #IceGitTestFactory,
#superclass : #IceAbstractTestFactory,
#category : 'Iceberg-Tests-Git'
#category : #'Iceberg-Tests-Git'
}

{ #category : #initialization }
Expand Down Expand Up @@ -72,7 +72,7 @@ IceGitTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirec
{ #category : #initialization }
IceGitTestFactory >> remoteFileUrl [

^ (IceLibgitRepository repositoriesLocation / 'remote') asUrl.
^ (IceLibgitRepository repositoriesLocation / 'remote') resolve asUrl.
]

{ #category : #initialization }
Expand Down
4 changes: 2 additions & 2 deletions Iceberg-Tests/IceParameterizedTestCase.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Class {
'testParameters',
'oldShareRepositoriesBetweenImages'
],
#category : 'Iceberg-Tests-Base'
#category : #'Iceberg-Tests-Base'
}

{ #category : #'building suites' }
Expand Down Expand Up @@ -146,7 +146,7 @@ IceParameterizedTestCase >> tearDown [
do: [ :parameter |
[ parameter deactivate ]
on: Error
do: [ :error | error logCr ] ].
do: [ :error | error traceCr ] ].
IceLibgitRepository shareRepositoriesBetweenImages: oldShareRepositoriesBetweenImages.
super tearDown
]
2 changes: 1 addition & 1 deletion Iceberg/MCGitBasedNetworkRepository.extension.st
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ MCGitBasedNetworkRepository >> createIcebergRepositoryWithFallbackFor: remote ur
urlToUse := remoteUrl.
[ ^ self createIcebergRepositoryFor: urlToUse ]
on: IceAuthenticationError do: [ :e |
self crLog: ('I got an error while cloning: {1}. I will try to clone the HTTPS variant.' format: { e messageText }).
self traceCr: ('I got an error while cloning: {1}. I will try to clone the HTTPS variant.' format: { e messageText }).
urlToUse := remote httpsUrl.
e retry ]
]
Expand Down
6 changes: 4 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ environment:
SCI_RUN: /cygdrive/c/smalltalkCI-master/bin/smalltalkci
CI: true
matrix:
- SMALLTALK: Pharo-7.0
- SMALLTALK: Pharo-6.1
- SMALLTALK: Pharo32-8.0
- SMALLTALK: Pharo32-9.0
- SMALLTALK: Pharo64-8.0
- SMALLTALK: Pharo64-9.0


platform:
Expand Down

0 comments on commit d1f73bd

Please sign in to comment.