tdlight-team/tdlight-java
tdlight-team/tdlight-java
1
2
Fork 0
Code Issues Releases Wiki Activity

Fix compilation issues

Browse Source
This commit is contained in:
Andrea Cavalli 2021-10-22 13:52:08 +02:00
parent b7f719e69e
commit 6ada063456
5 changed files with 77 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/pom.xml
View File

@ -26,24 +26,24 @@
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-java</artifactId> <artifactId>tdlight-java</artifactId>
<version>2.7.8.23</version> <version>2.7.8.28</version>
</dependency> </dependency>
<!-- TDLight natives --> <!-- TDLight natives -->
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-linux-amd64</artifactId> <artifactId>tdlight-natives-linux-amd64</artifactId>
<version>3.3.164</version> <version>4.0.168</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-windows-amd64</artifactId> <artifactId>tdlight-natives-windows-amd64</artifactId>
<version>3.3.164</version> <version>4.0.168</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-natives-osx-amd64</artifactId> <artifactId>tdlight-natives-osx-amd64</artifactId>
<version>3.3.164</version> <version>4.0.168</version>
</dependency> </dependency>
<!-- log4j logging --> <!-- log4j logging -->

72
pom.xml
View File

@ -4,13 +4,79 @@
<groupId>it.tdlight</groupId> <groupId>it.tdlight</groupId>
<artifactId>tdlight-java-parent</artifactId> <artifactId>tdlight-java-parent</artifactId>
<version>${revision}</version> <version>${revision}</version>
<name>TDLib Java Wrapper</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>TDLib Java Parent</name>
<properties> <properties>
<revision>1.0.0.0-SNAPSHOT</revision> <revision>1.0.0.0-SNAPSHOT</revision>
<apiRevisionNumber>168</apiRevisionNumber> <nativesRevisionNumber>169</nativesRevisionNumber>
<nativesRevisionSuffix/> <nativesRevisionSuffix/>
<apiRevisionNumber>166</apiRevisionNumber> <apiRevisionNumber>167</apiRevisionNumber>
<apiRevisionSuffix/> <apiRevisionSuffix/>
</properties> </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> </project>

4
scripts/core/deploy_release.sh
View File

@ -13,9 +13,9 @@ if [ -z "${IMPLEMENTATION_NAME}" ]; then
exit 1 exit 1
fi 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." echo "Done."
exit 0 exit 0

4
scripts/core/only_compile_release.sh
View File

@ -8,9 +8,9 @@ if [ -z "${IMPLEMENTATION_NAME}" ]; then
exit 1 exit 1
fi fi
cd ../../${IMPLEMENTATION_NAME} cd "../../"
mvn -B clean package --file pom.xml mvn -B -P "${IMPLEMENTATION_NAME}" clean package
echo "Done." echo "Done."
exit 0 exit 0

18
tdlight/pom.xml
View File

@ -300,24 +300,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> </plugins>
</build> </build>
</project> </project>