Skip to content

Commit

Permalink
Merge pull request #59 from spotify/fix-java-compatibility
Browse files Browse the repository at this point in the history
Fix library to release java 8 compatible jars
  • Loading branch information
caesar-ralf committed Oct 9, 2023
2 parents d906f23 + 72ddefa commit 33438a4
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 87 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ Guava's ListenableFuture class

### Build status

[![Travis](https://api.travis-ci.org/spotify/futures-extra.svg?branch=master)](https://travis-ci.org/spotify/futures-extra)
[![Build Status](https://github.com/spotify/futures-extra/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/spotify/futures-extra/actions/workflows/ci.yml?query=branch%3Amaster)
[![Coverage Status](http://img.shields.io/coveralls/spotify/futures-extra/master.svg)](https://coveralls.io/r/spotify/futures-extra?branch=master)

### Maven central

[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.spotify/futures-extra/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.spotify/futures-extra)


### Build dependencies
* Java 8 or higher
* Maven
Expand Down
80 changes: 28 additions & 52 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>4.3.3-SNAPSHOT</version>
<artifactId>futures-extra</artifactId>
<packaging>jar</packaging>

<name>futures-extra</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<parent>
<groupId>com.spotify</groupId>
<artifactId>foss-root</artifactId>
Expand Down Expand Up @@ -155,8 +153,6 @@
<failOnViolation>true</failOnViolation>
<failsOnError>true</failsOnError>
<maxAllowedViolations>0</maxAllowedViolations>
<!-- checkstyle does not support JPMS yet -->
<excludes>**/module-info.java</excludes>
</configuration>
<executions>
<execution>
Expand All @@ -175,51 +171,31 @@
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>11</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-bytecode-version</id>
<configuration>
<testExcludes>**/module-info.java</testExcludes>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>8</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.7.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</project>
34 changes: 0 additions & 34 deletions src/main/java/module-info.java

This file was deleted.

0 comments on commit 33438a4

Please sign in to comment.