Merge a4898ac into b00e4a0

.github/workflows/ci-linter.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        smalltalk: [ Squeak64-5.2 ]
+        smalltalk: [ Squeak64-Trunk ]
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

.github/workflows/main.yml

@@ -1,23 +1,15 @@
-
 name: CI
 
-on: 
-  push:
-    branches:
-      - develop
-      - master
-  pull_request:
-    branches:
-      - master
-      - develop
+on: [push, pull_request]
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        smalltalk: [ Squeak64-5.2 ]
+        smalltalk: [ Squeak64-Trunk, Squeak64-5.3, Squeak64-5.2 ]
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

.github/workflows/release.yml

@@ -1,16 +1,22 @@
 name: CI-Release
-on: 
+on:
   push:
-    branches:
-      - master
+    branches: [master, develop]
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        smalltalk: [ Squeak64-5.3 ]
+        os: [ubuntu-latest]
+        include:
+          - smalltalk: Squeak64-5.3
+            env:
+              tag_prefix: ''
+          - smalltalk: Squeak64-Trunk
+            env:
+              tag_prefix: Trunk
+
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -31,10 +37,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.current-time.outputs.formattedTime  }} 
-          release_name: Release ${{ steps.current-time.outputs.formattedTime  }}
+          tag_name: ${{ env.tag_prefix }}${{ steps.current-time.outputs.formattedTime }} 
+          release_name: ${{ matrix.smalltalk }} ${{ steps.current-time.outputs.formattedTime }}
           draft: false
-          prerelease: false
+          prerelease: ${{ github.ref == 'refs/heads/master' }}
       - name: Upload Release Asset
         id: upload-release-asset 
         uses: actions/upload-release-asset@v1

.squot

@@ -1,6 +1,6 @@
 OrderedDictionary {
-	'packages/TelegramClient-Core.package' : #SquotCypressCodeSerializer,
-	'packages/TelegramClient-Tests.package' : #SquotCypressCodeSerializer,
-	'packages/BaselineOfTelegramClient.package' : #SquotCypressCodeSerializer,
-	'packages/TelegramClient-UI.package' : #SquotCypressCodeSerializer
+	'packages\/TelegramClient-Core.package' : #SquotCypressCodeSerializer,
+	'packages\/TelegramClient-Tests.package' : #SquotCypressCodeSerializer,
+	'packages\/BaselineOfTelegramClient.package' : #SquotCypressCodeSerializer,
+	'packages\/TelegramClient-UI.package' : #SquotCypressCodeSerializer
 }

packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/instance/baseline..st

@@ -1,32 +1,33 @@
 baseline
 baseline: spec
-    <baseline>
-    spec
-        for: #'common'
-        do: [
-            Preferences disable: #showDeprecationWarnings.
-            spec
-                baseline: 'SwaLint' with: [
-                    spec
-                        repository: 'github://hpi-swa-teaching/SwaLint:release/packages'];
-                package: 'JSON' with: [
-                    spec
-                        file: 'JSON-ul.35';
-                        repository: 'http://www.squeaksource.com/JSON'];
-                package: 'FFI-Pools' with: [
-                    spec
-                        file: 'FFI-Pools-eem.13';
-                        repository: 'http://source.squeakfoundation.org/FFI'];
-                package: 'FFI-Kernel' with: [
-                    spec
-                        file: 'FFI-Kernel-nice.68';
-                        repository: 'http://source.squeakfoundation.org/FFI'];
-
-                package: 'TelegramClient-Core' with: [spec requires: #('libraries')];
-                package: 'TelegramClient-UI' with: [spec requires: #('libraries')];
-                package: 'TelegramClient-Tests' with: [spec requires: #('default' 'SwaLint')].
-
-            spec
-                group: 'libraries' with: #('JSON' 'FFI-Kernel' 'FFI-Pools');
-                group: 'default' with: #('TelegramClient-Core' 'TelegramClient-UI');
-                group: 'tests' with: #('TelegramClient-Tests')].
+	<baseline>
+
+	spec for: #common do: [
+		spec
+			baseline: 'Animations' with: [
+				spec repository: 'github://hpi-swa/animations:master/repository'];
+			project: 'FFI' with: [
+				spec
+					className: 'ConfigurationOfFFI';
+					repository: 'http://www.squeaksource.com/MetacelloRepository';
+					versionString: (SystemVersion current isAlpha
+						ifTrue: [#development]
+						ifFalse: [#stable]);
+					loads: #('Core')];
+			package: 'JSON' with: [
+				spec file: 'JSON-ul.35';
+				repository: 'https://www.squeaksource.com/JSON'];
+			baseline: 'SwaLint' with: [
+				spec repository: 'github://hpi-swa-teaching/SwaLint:release/packages'].
+
+		spec
+			package: 'TelegramClient-Core' with: [
+				spec requires: #('libraries')];
+			package: 'TelegramClient-UI' with: [
+				spec requires: #('libraries')];
+			package: 'TelegramClient-Tests' with: [
+				spec requires: #('default' 'SwaLint')].
+		spec
+			group: 'libraries' with: #('Animations' 'FFI' 'JSON');
+			group: 'default' with: #('TelegramClient-Core' 'TelegramClient-UI');
+			group: 'tests' with: #('TelegramClient-Tests')].

packages/BaselineOfTelegramClient.package/BaselineOfTelegramClient.class/methodProperties.json

@@ -2,5 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "N.S. 5/16/2020 17:20",
+		"baseline:" : "ct 10/8/2020 01:55",
 		"postLoad" : "N.S. 5/14/2020 17:20" } }

packages/TelegramClient-Tests.package/TCTAuthTests.class/instance/setUp.st

@@ -1,9 +1,10 @@
 running
 setUp
 
+	self timeout: 50 "seconds".
 	self core: TCTTestCore new.
-	1 seconds wait.
+	10 seconds wait.
 	self core authHandler isAuthorizationStateReady ifTrue: [self core authHandler logout.
-		1 seconds wait.
+		10 seconds wait.
 		self core: TCTTestCore new.
-		1 seconds wait].
+		10 seconds wait].

packages/TelegramClient-Tests.package/TCTAuthTests.class/instance/testAuthStateIsAwaitingPhoneNumber.st

@@ -1,4 +1,6 @@
 testing
 testAuthStateIsAwaitingPhoneNumber
 
-	self assert: self core authHandler isAwaitingPhoneNumber.
+	self
+		assert: self core authHandler isAwaitingPhoneNumber
+		description: ['Auth state was ' , self core authHandler authState].

packages/TelegramClient-Tests.package/TCTAuthTests.class/instance/testAuthStateReady.st

@@ -2,5 +2,7 @@ testing
 testAuthStateReady
 
 	self core loginWithTestData.
-	2 seconds wait.
-	self assert: self core authHandler isAuthorizationStateReady.
+	10 seconds wait.
+	self
+		assert: self core authHandler isAuthorizationStateReady
+		description: ['Expected auth state ready but was ' , self core authHandler authState]

packages/TelegramClient-Tests.package/TCTAuthTests.class/methodProperties.json

@@ -4,7 +4,7 @@
 	"instance" : {
 		"core" : "r.s 7/15/2020 12:39",
 		"core:" : "r.s 7/15/2020 12:39",
-		"setUp" : "r.s 7/15/2020 19:25",
+		"setUp" : "ct 10/8/2020 02:00",
 		"tearDown" : "r.s 7/15/2020 19:29",
-		"testAuthStateIsAwaitingPhoneNumber" : "r.s 7/15/2020 19:24",
-		"testAuthStateReady" : "r.s 7/15/2020 19:23" } }
+		"testAuthStateIsAwaitingPhoneNumber" : "ct 10/8/2020 01:41",
+		"testAuthStateReady" : "ct 10/8/2020 02:00" } }

packages/TelegramClient-Tests.package/TCTLoggedInTests.class/instance/setUp.st

@@ -1,9 +1,9 @@
 running
 setUp
 
-	self timeout: 20.
+	self timeout: 40 "seconds".
 	self core: TCTTestCore new.
-	1 seconds wait.
+	10 seconds wait.
 	self core authHandler isAuthorizationStateReady ifFalse: [
 		self core loginWithTestData.
-		2 seconds wait].
+		10 seconds wait].

packages/TelegramClient-Tests.package/TCTLoggedInTests.class/instance/testLogout.st

@@ -1,8 +1,6 @@
 testing
 testLogout
 
-	<timeout: 30 "seconds">
-
 	self core authHandler logout.
 	10 seconds wait.
 	self assert: self core authHandler isAuthStateClosed.

packages/TelegramClient-Tests.package/TCTLoggedInTests.class/methodProperties.json

@@ -4,7 +4,7 @@
 	"instance" : {
 		"core" : "r.s 7/15/2020 18:46",
 		"core:" : "r.s 7/15/2020 18:46",
-		"setUp" : "js 8/1/2020 12:51",
+		"setUp" : "ct 10/8/2020 01:59",
 		"tearDown" : "r.s 7/16/2020 16:54",
-		"testLogout" : "ct 10/7/2020 20:20",
+		"testLogout" : "ct 10/8/2020 01:59",
 		"testMessageSending" : "r.s 7/16/2020 16:53" } }