Skip to content

Commit 79cb5e9

Browse files
committed
Merge remote-tracking branch 'origin/master' into 0.14.x
# Conflicts: # tests/KotlinJava11Test.php
2 parents 71b7059 + ed26ca8 commit 79cb5e9

35 files changed

+1183
-125
lines changed

.travis.yml

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,34 @@ php:
1515
- 8.0
1616

1717
env:
18-
- SDK=Android
19-
- SDK=CLI
20-
- SDK=Dart
21-
- SDK=Deno
22-
- SDK=Flutter
23-
- SDK=Kotlin
24-
- SDK=Node
25-
- SDK=PHP
26-
- SDK=Python
27-
- SDK=Ruby
28-
- SDK=SwiftClient
29-
- SDK=SwiftServer
30-
- SDK=Web
18+
- SDK=Android11Java8
19+
- SDK=Android11Java11
20+
- SDK=Android12Java8
21+
- SDK=Android12Java11
22+
- SDK=CLINode14
23+
- SDK=CLINode16
24+
- SDK=DartBeta
25+
- SDK=DartStable
26+
- SDK=Deno1171
27+
- SDK=FlutterStable
28+
- SDK=KotlinJava8
29+
- SDK=KotlinJava11
30+
- SDK=KotlinJava17
31+
- SDK=Node12
32+
- SDK=Node14
33+
- SDK=Node16
34+
- SDK=PHP74
35+
- SDK=PHP80
36+
- SDK=Python38
37+
- SDK=Python39
38+
- SDK=Python310
39+
- SDK=Ruby27
40+
- SDK=Ruby30
41+
- SDK=Ruby31
42+
- SDK=SwiftClient55
43+
- SDK=SwiftServer55
44+
- SDK=WebChromium
45+
- SDK=WebNode
3146

3247
notifications:
3348
email:

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"matthiasmullie/minify": "^1.3"
2828
},
2929
"require-dev": {
30-
"phpunit/phpunit": "^9.5.13"
30+
"phpunit/phpunit": "^9.5.13",
31+
"brianium/paratest": "^6.4"
3132
},
3233
"minimum-stability": "dev",
3334
"prefer-stable": true

0 commit comments

Comments
 (0)