Update pom.xml and LoadLibrary.java

This commit is contained in:
Andrea Cavalli 2020-10-07 00:51:26 +02:00
parent 31c5f95926
commit 865997b52f
2 changed files with 50 additions and 29 deletions

62
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-java</artifactId> <artifactId>tdlight-java</artifactId>
<version>3.168.13</version> <version>3.169.0-SNAPSHOT</version>
<name>TDLight Java Wrapper</name> <name>TDLight Java Wrapper</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@ -15,54 +15,56 @@
<name>MCHV Apache Maven Packages</name> <name>MCHV Apache Maven Packages</name>
<url>https://mvn.mchv.eu/repository/mchv/</url> <url>https://mvn.mchv.eu/repository/mchv/</url>
</repository> </repository>
<repository>
<id>mchv-snapshot</id>
<name>MCHV Apache Maven Packages</name>
<url>https://mvn.mchv.eu/repository/mchv-snapshot/</url>
</repository>
</repositories> </repositories>
<profiles>
<profile>
<id>publish-to-mchv</id>
<properties/>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>mchv</id> <id>mchv</id>
<name>MCHV Apache Maven Packages</name> <name>MCHV Apache Maven Packages</name>
<url>https://mvn.mchv.eu/repository/mchv/</url> <url>https://mvn.mchv.eu/repository/mchv/</url>
</repository> </repository>
<snapshotRepository>
<id>mchv</id>
<name>MCHV Apache Maven Packages</name>
<url>https://mvn.mchv.eu/repository/mchv-snapshot/</url>
</snapshotRepository>
</distributionManagement> </distributionManagement>
</profile> <scm>
<profile> <connection>scm:git:https://git.ignuranza.net/tdlight-team/tdlight-java.git</connection>
<id>publish-to-github</id> <developerConnection>scm:git:https://git.ignuranza.net/tdlight-team/tdlight-java.git</developerConnection>
<properties/> <tag>master</tag>
<distributionManagement> </scm>
<repository>
<id>github</id>
<name>GitHub TDLight Team Apache Maven Packages</name>
<url>https://maven.pkg.github.com/tdlight-team/tdlight-java</url>
</repository>
</distributionManagement>
</profile>
</profiles>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-linux-amd64</artifactId> <artifactId>tdlight-natives-linux-amd64</artifactId>
<version>1.1.21</version> <version>2.0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-linux-aarch64</artifactId> <artifactId>tdlight-natives-linux-aarch64</artifactId>
<version>1.1.16</version> <version>2.0.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- Currently unsupported platform
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-windows-amd64</artifactId> <artifactId>tdlight-natives-windows-amd64</artifactId>
<version>1.1.20</version> <version>2.0.1-SNAPSHOT</version>
</dependency> </dependency>
-->
<!-- Currently unsupported platform
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-osx-amd64</artifactId> <artifactId>tdlight-natives-osx-amd64</artifactId>
<version>1.1.12</version> <version>2.0.1-SNAPSHOT</version>
</dependency> </dependency>
-->
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
@ -83,6 +85,22 @@
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M1</version>
<executions>
<execution>
<id>default</id>
<goals>
<goal>perform</goal>
</goals>
<configuration>
<pomFileName>${project.name}/pom.xml</pomFileName>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.0.2</version>

View File

@ -111,6 +111,8 @@ public class LoadLibrary {
break; break;
} }
break; break;
// Unsupported platforms:
/*
case osx: case osx:
if (arch == Arch.amd64) { if (arch == Arch.amd64) {
classForResource = it.tdlight.tdlight.osx.amd64.LoadLibrary.class; classForResource = it.tdlight.tdlight.osx.amd64.LoadLibrary.class;
@ -121,6 +123,7 @@ public class LoadLibrary {
classForResource = it.tdlight.tdlight.win.amd64.LoadLibrary.class; classForResource = it.tdlight.tdlight.win.amd64.LoadLibrary.class;
} }
break; break;
*/
} }
if (classForResource == null) { if (classForResource == null) {
throw new IOException("Native libraries for platform " + os + "-" + arch + " not found!"); throw new IOException("Native libraries for platform " + os + "-" + arch + " not found!");