Skip to content

Commit 894f1eb

Browse files
committed
Test against multiple JDK versions.
This required updating the version of `auto` and `kotlin` we use. Lastly, we updated the library-e2e-tester to run more tests.
1 parent e2b07f5 commit 894f1eb

4 files changed

Lines changed: 30 additions & 3 deletions

File tree

.buildscript/e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ "$RUN_E2E_TESTS" != "true" ]; then
66
echo "Skipping end to end tests."
77
else
88
echo "Running end to end tests..."
9-
wget https://github.com/segmentio/library-e2e-tester/releases/download/0.2.0/tester_linux_amd64
9+
wget https://github.com/segmentio/library-e2e-tester/releases/download/0.2.1/tester_linux_amd64
1010
chmod +x tester_linux_amd64
1111
./tester_linux_amd64 -segment-write-key="$SEGMENT_WRITE_KEY" -webhook-auth-username="$WEBHOOK_AUTH_USERNAME" -webhook-bucket="$WEBHOOK_BUCKET" -path='.buildscript/cli.sh'
1212
echo "End to end tests completed!"

.circleci/config.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,21 @@ jobs:
2020
root: .
2121
paths: [.]
2222

23+
test-jdklatest:
24+
<<: *java-base-test
25+
docker:
26+
- image: circleci/openjdk
27+
28+
test-jdk10:
29+
<<: *java-base-test
30+
docker:
31+
- image: circleci/openjdk:10-jdk-browsers
32+
33+
test-jdk9:
34+
<<: *java-base-test
35+
docker:
36+
- image: circleci/openjdk:9-jdk-browsers
37+
2338
test-jdk8:
2439
<<: *java-base-test
2540
docker:
@@ -45,6 +60,9 @@ workflows:
4560
version: 2
4661
multi-test:
4762
jobs:
63+
- test-jdklatest
64+
- test-jdk10
65+
- test-jdk9
4866
- test-jdk8
4967
test_and_publish:
5068
jobs:

analytics-core/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<artifactId>auto-value</artifactId>
3636
<scope>provided</scope>
3737
</dependency>
38+
<dependency>
39+
<groupId>com.google.auto.value</groupId>
40+
<artifactId>auto-value-annotations</artifactId>
41+
</dependency>
3842
<dependency>
3943
<groupId>com.google.guava</groupId>
4044
<artifactId>guava</artifactId>

pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
<properties>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3030
<java.version>1.7</java.version>
31-
<kotlin.version>1.0.3</kotlin.version>
31+
<kotlin.version>1.2.60</kotlin.version>
3232

3333
<!-- Third Party Dependencies -->
3434
<retrofit.version>1.9.0</retrofit.version>
35-
<auto.version>1.0</auto.version>
35+
<auto.version>1.6</auto.version>
3636
<findbugs.version>3.0.1</findbugs.version>
3737
<gson.version>2.3.1</gson.version>
3838
<okhttp.version>3.9.0</okhttp.version>
@@ -81,6 +81,11 @@
8181
<version>${auto.version}</version>
8282
<scope>provided</scope>
8383
</dependency>
84+
<dependency>
85+
<groupId>com.google.auto.value</groupId>
86+
<artifactId>auto-value-annotations</artifactId>
87+
<version>${auto.version}</version>
88+
</dependency>
8489
<dependency>
8590
<groupId>com.google.code.findbugs</groupId>
8691
<artifactId>findbugs</artifactId>

0 commit comments

Comments
 (0)