Skip to content

Commit c48bfab

Browse files
authored
Merge pull request #49 from mP1/feature/Upgrade-Java11
Upgrade Java11
2 parents 8da4580 + 52144af commit c48bfab

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
- name: Download repository
1111
uses: actions/checkout@v2
1212

13-
- name: Set up JDK 9
13+
- name: Set up JDK 11
1414
uses: actions/setup-java@v1
1515
with:
16-
java-version: 9
16+
java-version: 11
1717

1818
- name: Maven dependency/resolve
1919
run: mvn dependency:resolve

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
<artifactId>maven-compiler-plugin</artifactId>
9797
<version>3.7.0</version>
9898
<configuration>
99-
<source>9</source>
100-
<target>9</target>
99+
<source>11</source>
100+
<target>11</target>
101101
<forceJavacCompilerUse>true</forceJavacCompilerUse>
102102
<!-- Need to disable annotation processing otherwise javac will complain that it cant find the annotation processor
103103
in /META-INF/services/javax.annotation.processing.Processor which has not yet been compiled-->

src/test/java/walkingkooka/j2cl/java/util/timezone/annotationprocessor/TimeZoneProviderToolTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,17 @@ public void testENAUAustralia() throws Exception {
6969

7070
@Test
7171
public void testENAUENNZAustralia() throws Exception {
72-
this.generateAndCheck("EN-AU,EN-NZ",
72+
this.generateAndCheck(
73+
"EN-AU,EN-NZ",
7374
"Australia/*",
7475
"// Timezone ids: 1, locales: 2\n" +
7576
"// Australia/*\n" +
7677
"// rawOffset: 0\n" +
7778
"// default firstDayOfWeek: 1\n" +
7879
"// default minimalDaysInFirstWeek: 1\n" +
80+
"// locales=en-NZ\n" +
81+
"// firstDayOfWeek: 2\n" +
82+
"// minimalDaysInFirstWeek: 1\n" +
7983
"// en-AU, en-NZ=\"GMT\" \"GMT\" \"Greenwich Mean Time\" \"Greenwich Mean Time\"\n" +
8084
"// default shortDisplayName: GMT\n" +
8185
"// default shortDisplayNameDaylight: GMT\n" +
@@ -84,7 +88,8 @@ public void testENAUENNZAustralia() throws Exception {
8488
"// \n" +
8589
"\n" +
8690
"\n" +
87-
"1,Australia/*,0,0,0,0,0,0,1,1,0,GMT,GMT,Greenwich Mean Time,Greenwich Mean Time,0");
91+
"1,Australia/*,0,0,0,0,0,0,1,1,1,1,en-NZ,2,1,GMT,GMT,Greenwich Mean Time,Greenwich Mean Time,0"
92+
);
8893
}
8994

9095
private void generateAndCheck(final String filter,

0 commit comments

Comments
 (0)