Fix compilation issues
This commit is contained in:
Andrea Cavalli
parent
b7f719e69e
commit
6ada063456
|
|
@ -26,24 +26,24 @@
|
|||
<dependency>
|
||||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-java</artifactId>
|
||||
<version>2.7.8.23</version>
|
||||
<version>2.7.8.28</version>
|
||||
</dependency>
|
||||
|
||||
<!-- TDLight natives -->
|
||||
<dependency>
|
||||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-natives-linux-amd64</artifactId>
|
||||
<version>3.3.164</version>
|
||||
<version>4.0.168</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-natives-windows-amd64</artifactId>
|
||||
<version>3.3.164</version>
|
||||
<version>4.0.168</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-natives-osx-amd64</artifactId>
|
||||
<version>3.3.164</version>
|
||||
<version>4.0.168</version>
|
||||
</dependency>
|
||||
|
||||
<!-- log4j logging -->
|
||||
|
|
|
|||
72
pom.xml
72
pom.xml
|
|
@ -4,13 +4,79 @@
|
|||
<groupId>it.tdlight</groupId>
|
||||
<artifactId>tdlight-java-parent</artifactId>
|
||||
<version>${revision}</version>
|
||||
<name>TDLib Java Wrapper</name>
|
||||
<packaging>pom</packaging>
|
||||
<name>TDLib Java Parent</name>
|
||||
<properties>
|
||||
<revision>1.0.0.0-SNAPSHOT</revision>
|
||||
<apiRevisionNumber>168</apiRevisionNumber>
|
||||
<nativesRevisionNumber>169</nativesRevisionNumber>
|
||||
<nativesRevisionSuffix/>
|
||||
<apiRevisionNumber>166</apiRevisionNumber>
|
||||
<apiRevisionNumber>167</apiRevisionNumber>
|
||||
<apiRevisionSuffix/>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>mchv-release</id>
|
||||
<name>MCHV Release Apache Maven Packages</name>
|
||||
<url>https://mvn.mchv.eu/repository/mchv</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>mchv-snapshot</id>
|
||||
<name>MCHV Snapshot Apache Maven Packages</name>
|
||||
<url>https://mvn.mchv.eu/repository/mchv-snapshot</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>mchv-release-distribution</id>
|
||||
<name>MCHV Release Apache Maven Packages Distribution</name>
|
||||
<url>https://mvn.mchv.eu/repository/mchv</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>mchv-snapshot-distribution</id>
|
||||
<name>MCHV Snapshot Apache Maven Packages Distribution</name>
|
||||
<url>https://mvn.mchv.eu/repository/mchv-snapshot</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
<scm>
|
||||
<connection>scm:git:https://git.ignuranza.net/tdlight-team/tdlight-java.git</connection>
|
||||
<developerConnection>scm:git:https://git.ignuranza.net/tdlight-team/tdlight-java.git</developerConnection>
|
||||
<tag>HEAD</tag>
|
||||
</scm>
|
||||
|
||||
<modules/>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<source>8</source>
|
||||
<target>8</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>tdlib</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>tdlib</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>tdlight</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>tdlight</module>
|
||||
</modules>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ if [ -z "${IMPLEMENTATION_NAME}" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
cd ../../${IMPLEMENTATION_NAME}
|
||||
cd ../../
|
||||
|
||||
mvn -B -DnativesRevisionNumber="${REVISION}" -DnativesRevisionSuffix="" clean deploy --file pom.xml
|
||||
mvn -B -P "${IMPLEMENTATION_NAME}" -Drevision="${REVISION}" clean deploy
|
||||
|
||||
echo "Done."
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ if [ -z "${IMPLEMENTATION_NAME}" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
cd ../../${IMPLEMENTATION_NAME}
|
||||
cd "../../"
|
||||
|
||||
mvn -B clean package --file pom.xml
|
||||
mvn -B -P "${IMPLEMENTATION_NAME}" clean package
|
||||
|
||||
echo "Done."
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -300,24 +300,6 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>properties-maven-plugin</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>initialize</phase>
|
||||
<goals>
|
||||
<goal>read-project-properties</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<files>
|
||||
<file>${basedir}/../nativesBuildNumber.properties</file>
|
||||
</files>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue