Skip to content

Commit

Permalink
update to version 2015e
Browse files Browse the repository at this point in the history
including new Android service-loader-file (see issue #289)
  • Loading branch information
MenoData committed Jun 15, 2015
1 parent b89792a commit 8a16e7e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
14 changes: 10 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.time4j</groupId>
<artifactId>time4j-tzdata</artifactId>
<version>1.3-2015d</version>
<version>1.4-2015e</version>
<packaging>jar</packaging>
<name>Time4J-TZDATA</name>

Expand Down Expand Up @@ -196,19 +196,25 @@
<dependency>
<groupId>net.time4j</groupId>
<artifactId>time4j-core</artifactId>
<version>[3.1,)</version>
<version>[3.2,]</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.time4j</groupId>
<artifactId>time4j-olson</artifactId>
<version>[3.1,)</version>
<version>[3.2,]</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.time4j</groupId>
<artifactId>time4j-misc</artifactId>
<version>[3.2,]</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.time4j</groupId>
<artifactId>time4j-i18n</artifactId>
<version>[3.1,)</version>
<version>3.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import net.time4j.PlainDate;
import net.time4j.base.GregorianDate;
import net.time4j.scale.LeapSecondProvider;
import net.time4j.tz.ExtZoneProvider;
import net.time4j.tz.NameStyle;
import net.time4j.tz.Timezone;
import net.time4j.tz.TransitionHistory;
Expand Down Expand Up @@ -56,7 +57,7 @@
* @since 1.0
*/
public class TimezoneRepositoryProviderSPI
implements ZoneProvider, LeapSecondProvider {
implements ExtZoneProvider, LeapSecondProvider {

//~ Statische Felder/Initialisierungen --------------------------------

Expand All @@ -72,7 +73,7 @@ public class TimezoneRepositoryProviderSPI
JDK_NAME_REFS = Collections.unmodifiableSet(jdkNameRefs);
}

private static final ZoneProvider NAME_PROVIDER = new ZoneNameProviderSPI();
private static final ExtZoneProvider NAME_PROVIDER = new ZoneNameProviderSPI();

//~ Instanzvariablen --------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
net.time4j.tz.spi.ZoneNameProviderSPI
net.time4j.tz.spi.WinZoneProviderSPI
net.time4j.tz.spi.MilZoneProviderSPI
net.time4j.tz.repository.TimezoneRepositoryProviderSPI
Binary file modified src/main/resources/tzrepo/tzdata.repository
Binary file not shown.

0 comments on commit 8a16e7e

Please sign in to comment.