Merge pull request #44 from ba-st/update_dependencies

Update dependencies
ba-st · May 5, 2020 · 0bfdf38 · 0bfdf38
2 parents 79940c5 + 1146de7
commit 0bfdf38
Show file tree

Hide file tree

Showing 27 changed files with 222 additions and 158 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,18 @@
+name: Build
+
+on: [push,pull_request]
+
+jobs:
+   build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        smalltalk: [ Pharo64-8.0, Pharo64-7.0, Pharo32-7.0, Pharo32-6.1 ]
+    name: ${{ matrix.smalltalk }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ba-st-actions/[email protected]
+        with:
+          smalltalk-version: ${{ matrix.smalltalk }}
+      - run: smalltalkci -s ${{ matrix.smalltalk }}
+        timeout-minutes: 15
diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml
@@ -0,0 +1,17 @@
+name: Release Notifications
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Notify about a new release
+      uses: ba-st-actions/[email protected]
+      env:
+        SENDGRID_API_TOKEN: ${{ secrets.SENDGRID_API_TOKEN }}
+        RECIPIENTS_URL: ${{ secrets.RECIPIENTS_URL }}
+        DISTRIBUTION_LISTS: ${{ secrets.DISTRIBUTION_LISTS }}
+        SENDER_EMAIL: ${{ secrets.SENDER_EMAIL }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -13,7 +13,9 @@
 </p>
 
 [![GitHub release](https://img.shields.io/github/release/ba-st/Willow-Playground.svg)](https://github.com/ba-st/Willow-Playground/releases/latest)
-[![Build Status](https://travis-ci.org/ba-st/Willow-Playground.svg?branch=release-candidate)](https://travis-ci.org/ba-st/Willow-Playground)
+[![Build Status](https://github.com/ba-st/Willow-Playground/workflows/Build/badge.svg?branch=release-candidate)](https://github.com/ba-st/Willow-Playground/actions?query=workflow%3ABuild)
+[![Pharo 7.0](https://img.shields.io/badge/Pharo-7.0-informational)](https://pharo.org)
+[![Pharo 8.0](https://img.shields.io/badge/Pharo-8.0-informational)](https://pharo.org)
 
 ## Goals
 - Present the different components and features of Willow

diff --git a/source/BaselineOfWillowPlayground/BaselineOfWillowPlayground.class.st b/source/BaselineOfWillowPlayground/BaselineOfWillowPlayground.class.st
@@ -15,13 +15,28 @@ BaselineOfWillowPlayground >> baseline: spec [
 		for: #pharo
 		do: [ self
 				setUpDependencies: spec;
-				baselineWillowPlayground: spec.
+				setUpPackages: spec.
 			spec group: 'Development' with: 'Deployment'
 			]
 ]
 
 { #category : #baselines }
-BaselineOfWillowPlayground >> baselineWillowPlayground: spec [
+BaselineOfWillowPlayground >> setUpDependencies: spec [
+
+	spec
+		baseline: 'WillowBootstrap'
+			with: [ spec repository: 'github://ba-st/Willow-Bootstrap:v12/source' ];
+		project: 'Willow-Bootstrap-Deployment'
+			copyFrom: 'WillowBootstrap'
+			with: [ spec loads: 'Deployment' ].
+
+	spec
+		baseline: 'WillowSpinKit' with: [ spec repository: 'github://ba-st/Willow-SpinKit:v8/source' ];
+		project: 'Willow-SpinKit-Deployment' copyFrom: 'WillowSpinKit' with: [ spec loads: 'Deployment' ]
+]
+
+{ #category : #baselines }
+BaselineOfWillowPlayground >> setUpPackages: spec [
 
 	spec
 		package: 'Willow-Playground-TestRunner'
@@ -34,18 +49,3 @@ BaselineOfWillowPlayground >> baselineWillowPlayground: spec [
 			with: [ spec requires: #('Willow-Playground-TestRunner' 'Willow-Playground-LiveDocs') ];
 		group: 'Deployment' with: 'Willow-Playground-Smalltalks2017'
 ]
-
-{ #category : #baselines }
-BaselineOfWillowPlayground >> setUpDependencies: spec [
-
-	spec
-		baseline: 'WillowBootstrap'
-			with: [ spec repository: 'github://ba-st/Willow-Bootstrap:v11/source' ];
-		project: 'Willow-Bootstrap-Deployment'
-			copyFrom: 'WillowBootstrap'
-			with: [ spec loads: 'Deployment' ].
-
-	spec
-		baseline: 'WillowSpinKit' with: [ spec repository: 'github://ba-st/Willow-SpinKit:v7/source' ];
-		project: 'Willow-SpinKit-Deployment' copyFrom: 'WillowSpinKit' with: [ spec loads: 'Deployment' ]
-]
diff --git a/source/Willow-Playground-LiveDocs/WPLiveDocumentation.class.st b/source/Willow-Playground-LiveDocs/WPLiveDocumentation.class.st
@@ -31,14 +31,14 @@ WPLiveDocumentation class >> sessionClass [
 { #category : #Accessing }
 WPLiveDocumentation >> componentSupplierForApplication [
 
-	^ BootstrapComponentSupplier
+	^ Bootstrap3ComponentSupplier
 		withBootstrapLibrary: (self deploymentMode libraryFor: Bootstrap3MetadataLibrary) withoutOptionalTheme
 		selectLibrary: ((self deploymentMode libraryFor: BootstrapSelectLibrary) using: self language)
 		datepickerLibrary: ((self deploymentMode libraryFor: BootstrapDatepickerLibrary) using: self language)
 		typeaheadLibrary: (self deploymentMode libraryFor: BootstrapTypeaheadLibrary) default
 ]
 
-{ #category : #accessing }
+{ #category : #Accessing }
 WPLiveDocumentation >> contentView [
 
 	^ contentView
@@ -68,24 +68,28 @@ WPLiveDocumentation >> initializeContainerView [
 		containing: WPLiveDocumentationBehaviorWebView new
 		applying: [ :div | 
 			div
-				setStyleTo: [ :style  | 
+				setStyleTo: [ :style | 
 					style
 						maxHeight: 100 vh;
-						overflowY: #scroll ] ].
+						overflowY: #scroll
+					]
+			].
 	scopeSelection := WPLiveDocumentationScopeSelectionWebView new.
-	scopeSelection onBehaviorSelectedTrigger show: SpinKitTripleBounce new whileCallingServerToRender: behaviorDetails.
+	scopeSelection onBehaviorSelectedTrigger
+		show: SpinKitFlow new
+		whileCallingServerToRender: behaviorDetails.
 
 	contentView := GenericContainerWebView
 		wrapping:
-			(self componentSupplier gridBuilder
+			( self componentSupplier gridBuilder
 				columnsWidths: #(3 9);
 				addContent: scopeSelection;
 				addContent: behaviorDetails;
-				build)
-		applying: [ :div | div addClass bootstrap container ]
+				build )
+		applying: [ :div | div addClass bootstrap3 container ]
 ]
 
-{ #category : #accessing }
+{ #category : #Accessing }
 WPLiveDocumentation >> jQueryLibrary [
 
 	^ (self deploymentMode libraryFor: JQuery3MetadataLibrary) default
@@ -94,5 +98,5 @@ WPLiveDocumentation >> jQueryLibrary [
 { #category : #updating }
 WPLiveDocumentation >> requiredLibraries [
 
-	^ {SpinKitMetadataLibrary default}
+	^ {( self deploymentMode libraryFor: SpinKitMetadataLibrary ) default}
 ]
diff --git a/source/Willow-Playground-LiveDocs/WPLiveDocumentationBehaviorWebView.class.st b/source/Willow-Playground-LiveDocs/WPLiveDocumentationBehaviorWebView.class.st
@@ -14,7 +14,7 @@ WPLiveDocumentationBehaviorWebView >> buttonToBrowse: aBehavior [
 
 	browseButton := self componentSupplier
 		asynchronicLinkActingAsButtonLabeled: 'Open Browser'
-		applying: [ :button | button addClass bootstrap buttonPrimary + button addClass bootstrap pullRight ].
+		applying: [ :button | button addClass bootstrap3 buttonPrimary + button addClass bootstrap3 pullRight ].
 	browseButton onTrigger evaluate: [ aBehavior browse ].
 	^ browseButton
 ]
@@ -27,7 +27,7 @@ WPLiveDocumentationBehaviorWebView >> classNameHeaderFor: aClass [
 			html
 				render: aClass name;
 				space.
-			html span with: 'CLASS' applying: [ :span | span addClass bootstrap badge ].
+			html span with: 'CLASS' applying: [ :span | span addClass bootstrap3 badge ].
 			html render: (self buttonToBrowse: aClass) ]
 		withLevel: 2
 ]
@@ -39,14 +39,14 @@ WPLiveDocumentationBehaviorWebView >> emptyPlaceholder [
 		informational;
 		wrapping: [ :canvas | 
 			canvas
-				render: (BootstrapIconWebView representing: Glyphicons exclamationSign);
+				render: (Bootstrap3IconWebView representing: Glyphicons exclamationSign);
 				space;
 				strong: 'Hey! Looks like you don''t selected anything yet.';
 				break;
 				break;
 				render: 'Give it a try to the left panel. Select a package and later a behavior to view it''s details.';
 				space;
-				strong: (BootstrapIconWebView representing: Glyphicons thumbsUp) ];
+				strong: (Bootstrap3IconWebView representing: Glyphicons thumbsUp) ];
 		build
 ]
 
@@ -102,6 +102,6 @@ WPLiveDocumentationBehaviorWebView >> traitNameHeaderFor: aTrait [
 			html
 				render: aTrait name;
 				space.
-			html span with: 'TRAIT' applying: [ :span | span addClass bootstrap badge ] ]
+			html span with: 'TRAIT' applying: [ :span | span addClass bootstrap3 badge ] ]
 		withLevel: 2
 ]
diff --git a/source/Willow-Playground-LiveDocs/WPLiveDocumentationClassDefinitionCard.class.st b/source/Willow-Playground-LiveDocs/WPLiveDocumentationClassDefinitionCard.class.st
@@ -46,6 +46,6 @@ WPLiveDocumentationClassDefinitionCard >> renderContentOn: html [
 								definitionData: [ selectedClass sharedPools do: [ :pool | canvas render: pool name ] separatedBy: [ canvas break ] ];
 								definitionTerm: 'Category';
 								definitionData: selectedClass category ]
-						applying: [ :list | list addClass bootstrap definitionListHorizontal ] ];
-				buildApplying: [ :panel | panel addClass bootstrap panelDefault ])
+						applying: [ :list | list addClass bootstrap3 definitionListHorizontal ] ];
+				buildApplying: [ :panel | panel addClass bootstrap3 panelDefault ])
 ]
diff --git a/source/Willow-Playground-LiveDocs/WPLiveDocumentationClassHierarchyCard.class.st b/source/Willow-Playground-LiveDocs/WPLiveDocumentationClassHierarchyCard.class.st
@@ -39,5 +39,5 @@ WPLiveDocumentationClassHierarchyCard >> renderContentOn: html [
 							canvas
 								render: class name;
 								break ] ];
-				buildApplying: [ :panel | panel addClass bootstrap panelDefault ])
+				buildApplying: [ :panel | panel addClass bootstrap3 panelDefault ])
 ]
diff --git a/source/Willow-Playground-LiveDocs/WPLiveDocumentationMethodCard.class.st b/source/Willow-Playground-LiveDocs/WPLiveDocumentationMethodCard.class.st
@@ -24,9 +24,9 @@ WPLiveDocumentationMethodCard >> initializeFor: aMethod [
 	methodPanel := self componentSupplier panelBuilder
 		headingDisplaying: [ :canvas | 
 			canvas strong: aMethod selector.
-			canvas span with: aMethod protocol applying: [ :badge | badge addClass bootstrap badge + badge addClass bootstrap pullRight ] ];
+			canvas span with: aMethod protocol applying: [ :badge | badge addClass bootstrap3 badge + badge addClass bootstrap3 pullRight ] ];
 		wrapping: (self panelContentFor: aMethod);
-		buildApplying: [ :panel | panel addClass bootstrap panelDefault ]
+		buildApplying: [ :panel | panel addClass bootstrap3 panelDefault ]
 ]
 
 { #category : #initialization }

diff --git a/source/Willow-Playground-LiveDocs/WPLiveDocumentationScopeSelectionWebView.class.st b/source/Willow-Playground-LiveDocs/WPLiveDocumentationScopeSelectionWebView.class.st
@@ -64,9 +64,10 @@ WPLiveDocumentationScopeSelectionWebView >> initializePackagesDropdown [
 { #category : #private }
 WPLiveDocumentationScopeSelectionWebView >> labeledViewDisplaying: aLabel boundTo: aField [
 
-	^ BootstrapLabeledWebView
+	^ self componentSupplier
+		labeledFieldApplying: [  ]
 		displaying: aLabel
-		applying: [ :label | label addClass bootstrap screenReaderOnly ]
+		applying: [ :label | label addClass bootstrap3 screenReaderOnly ]
 		boundTo: aField
 		applying: [  ]
 ]
@@ -82,20 +83,24 @@ WPLiveDocumentationScopeSelectionWebView >> renderContentOn: html [
 
 	html
 		render:
-			(self componentSupplier gridBuilder
+			( self componentSupplier gridBuilder
 				columnsPerRow: 1;
 				addContent:
-					(self componentSupplier
-						fieldSetContaining: (self componentSupplier delayedViewShowing: SpinKitCircle new whileEvaluating: [ packagesDropdown allowAnyOf: self session applicationContext availablePackages ] thenRendering: packagesDropdown)
+					( self componentSupplier
+						fieldSetContaining:
+							( self componentSupplier
+								delayedViewShowing: SpinKitCircle new
+								whileEvaluating: [ packagesDropdown allowAnyOf: self session applicationContext availablePackages ]
+								thenRendering: packagesDropdown )
 						applying: [  ]
 						withLegend: 'Packages'
-						applying: [  ]);
+						applying: [  ] );
 				addContent: [ :canvas | canvas horizontalRule ];
 				addContent:
-					(self componentSupplier
+					( self componentSupplier
 						fieldSetContaining: identifiedBehaviorSelection
 						applying: [  ]
 						withLegend: 'Classes & Traits'
-						applying: [  ]);
-				build)
+						applying: [  ] );
+				build )
 ]
diff --git a/source/Willow-Playground-Smalltalks2017/AdvancedComponentsExampleStepWebView.class.st b/source/Willow-Playground-Smalltalks2017/AdvancedComponentsExampleStepWebView.class.st
@@ -36,7 +36,7 @@ AdvancedComponentsExampleStepWebView >> initialize [
 { #category : #initialization }
 AdvancedComponentsExampleStepWebView >> initializeDelayed [
 	delayed := DelayedViewRenderer
-		showing: SpinKitCubeGrid new
+		showing: SpinKitGrid new
 		whileEvaluating: [ self makeHeavyCalculations ]
 		thenRendering: [ :canvas | canvas 
 							render: periodical;
@@ -60,7 +60,7 @@ AdvancedComponentsExampleStepWebView >> initializeTable [
 	  addColumn: [:column | column titled: 'Decimal'; rendering: [ :number | number ]];
 	  addColumn: [:column | column titled: 'Hex'; rendering: [ :number | number printStringHex ]];
 	  addColumn: [:column | column titled: 'Roman'; rendering: [ :number | number printStringRoman ]];
-	  buildApplying: [ :theTable | theTable addClass bootstrap table ].
+	  buildApplying: [ :theTable | theTable addClass bootstrap3 table ].
 	table changeContentsTo: #(26 51 78)
 ]
 

diff --git a/source/Willow-Playground-Smalltalks2017/CommandSummaryStepWebView.class.st b/source/Willow-Playground-Smalltalks2017/CommandSummaryStepWebView.class.st
@@ -12,7 +12,9 @@ CommandSummaryStepWebView >> anchorToBrowse: method [
 
 	| anchor |
 
-	anchor := self componentSupplier asynchronicLinkActingAsButtonLabeled: method selector applying: [ :button | button addClass bootstrap buttonLink ].
+	anchor := self componentSupplier
+		asynchronicLinkActingAsButtonLabeled: method selector
+		applying: [ :button | button addClass bootstrap3 buttonLink ].
 	anchor onTrigger evaluate: [ method browse ].
 	^ anchor
 ]

diff --git a/source/Willow-Playground-Smalltalks2017/IntroductionStepWebView.class.st b/source/Willow-Playground-Smalltalks2017/IntroductionStepWebView.class.st
@@ -17,15 +17,15 @@ IntroductionStepWebView >> description [
 IntroductionStepWebView >> loadWillowFromGitHubCode [
  Metacello new
 	baseline: 'Willow';
-	repository: 'github://ba-st/Willow:master/source';
+	repository: 'github://ba-st/Willow:release-candidate/source';
 	load
 ]
 
 { #category : #'private-accessing' }
 IntroductionStepWebView >> loadWillowPlaygroundFromGitHubCode [
  Metacello new
 	baseline: 'WillowPlayground';
-	repository: 'github://ba-st/Willow-Playground:master/source';
+	repository: 'github://ba-st/Willow-Playground:release-candidate/source';
 	load
 ]