Cleanup code
This commit is contained in:
parent
c3cdefe5c3
commit
cb024a114f
@ -4,7 +4,7 @@ root = true
|
|||||||
charset = utf-8
|
charset = utf-8
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
indent_style = space
|
indent_style = tab
|
||||||
insert_final_newline = false
|
insert_final_newline = false
|
||||||
max_line_length = 120
|
max_line_length = 120
|
||||||
tab_width = 2
|
tab_width = 2
|
||||||
|
191
example/pom.xml
191
example/pom.xml
@ -1,98 +1,99 @@
|
|||||||
<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/xsd/maven-4.0.0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
<modelVersion>4.0.0</modelVersion>
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<groupId>it.tdlight</groupId>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>example-java</artifactId>
|
<groupId>it.tdlight</groupId>
|
||||||
<version>1.0.0.0-SNAPSHOT</version>
|
<artifactId>example-java</artifactId>
|
||||||
<name>TDLight Java Example</name>
|
<version>1.0.0.0-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<name>TDLight Java Example</name>
|
||||||
<properties>
|
<packaging>jar</packaging>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<properties>
|
||||||
</properties>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<repositories>
|
</properties>
|
||||||
<repository>
|
<repositories>
|
||||||
<id>mchv-release</id>
|
<repository>
|
||||||
<name>MCHV Release Apache Maven Packages</name>
|
<id>mchv-release</id>
|
||||||
<url>https://mvn.mchv.eu/repository/mchv</url>
|
<name>MCHV Release Apache Maven Packages</name>
|
||||||
</repository>
|
<url>https://mvn.mchv.eu/repository/mchv</url>
|
||||||
<repository>
|
</repository>
|
||||||
<id>mchv-snapshot</id>
|
<repository>
|
||||||
<name>MCHV Snapshot Apache Maven Packages</name>
|
<id>mchv-snapshot</id>
|
||||||
<url>https://mvn.mchv.eu/repository/mchv-snapshot</url>
|
<name>MCHV Snapshot Apache Maven Packages</name>
|
||||||
</repository>
|
<url>https://mvn.mchv.eu/repository/mchv-snapshot</url>
|
||||||
</repositories>
|
</repository>
|
||||||
<dependencies>
|
</repositories>
|
||||||
<!-- TDLight -->
|
<dependencies>
|
||||||
<dependency>
|
<!-- TDLight -->
|
||||||
<groupId>it.tdlight</groupId>
|
<dependency>
|
||||||
<artifactId>tdlight-java</artifactId>
|
<groupId>it.tdlight</groupId>
|
||||||
<version>2.7.8.23</version>
|
<artifactId>tdlight-java</artifactId>
|
||||||
</dependency>
|
<version>2.7.8.23</version>
|
||||||
|
</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>3.3.164</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>3.3.164</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>3.3.164</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- log4j logging -->
|
<!-- log4j logging -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j-core</artifactId>
|
<artifactId>log4j-core</artifactId>
|
||||||
<version>2.14.1</version>
|
<version>2.14.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j-slf4j-impl</artifactId>
|
<artifactId>log4j-slf4j-impl</artifactId>
|
||||||
<version>2.14.1</version>
|
<version>2.14.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.lmax</groupId>
|
<groupId>com.lmax</groupId>
|
||||||
<artifactId>disruptor</artifactId>
|
<artifactId>disruptor</artifactId>
|
||||||
<version>3.4.4</version>
|
<version>3.4.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
<version>3.1.0</version>
|
<version>3.1.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.0.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.8.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
<source>8</source>
|
<source>8</source>
|
||||||
<target>8</target>
|
<target>8</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>3.2.0</version>
|
<version>3.2.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-install-plugin</artifactId>
|
<artifactId>maven-install-plugin</artifactId>
|
||||||
<version>3.0.0-M1</version>
|
<version>3.0.0-M1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
<version>2.8.2</version>
|
<version>2.8.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
143
tdlib/pom.xml
143
tdlib/pom.xml
@ -1,4 +1,5 @@
|
|||||||
<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>it.tdlight</groupId>
|
<groupId>it.tdlight</groupId>
|
||||||
<artifactId>tdlib-java</artifactId>
|
<artifactId>tdlib-java</artifactId>
|
||||||
@ -8,10 +9,10 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<revision>1.0.0.0-SNAPSHOT</revision>
|
<revision>1.0.0.0-SNAPSHOT</revision>
|
||||||
<nativesRevisionNumber>0</nativesRevisionNumber>
|
<nativesRevisionNumber>0</nativesRevisionNumber>
|
||||||
<nativesRevisionSuffix>-SNAPSHOT</nativesRevisionSuffix>
|
<nativesRevisionSuffix>-SNAPSHOT</nativesRevisionSuffix>
|
||||||
<apiRevisionNumber>0</apiRevisionNumber>
|
<apiRevisionNumber>0</apiRevisionNumber>
|
||||||
<apiRevisionSuffix>-SNAPSHOT</apiRevisionSuffix>
|
<apiRevisionSuffix>-SNAPSHOT</apiRevisionSuffix>
|
||||||
</properties>
|
</properties>
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
@ -46,7 +47,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>it.tdlight</groupId>
|
<groupId>it.tdlight</groupId>
|
||||||
<artifactId>tdlib-api</artifactId>
|
<artifactId>tdlib-api</artifactId>
|
||||||
<version>4.0.${apiRevisionNumber}${apiRevisionSuffix}</version>
|
<version>4.0.${apiRevisionNumber}${apiRevisionSuffix}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>it.cavallium</groupId>
|
<groupId>it.cavallium</groupId>
|
||||||
@ -67,14 +68,14 @@
|
|||||||
<artifactId>reactive-streams</artifactId>
|
<artifactId>reactive-streams</artifactId>
|
||||||
<version>1.0.3</version>
|
<version>1.0.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.harawata</groupId>
|
<groupId>net.harawata</groupId>
|
||||||
<artifactId>appdirs</artifactId>
|
<artifactId>appdirs</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.zxing</groupId>
|
<groupId>com.google.zxing</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -83,18 +84,18 @@
|
|||||||
<artifactId>fastutil</artifactId>
|
<artifactId>fastutil</artifactId>
|
||||||
<version>8.5.6</version>
|
<version>8.5.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.harawata</groupId>
|
<groupId>net.harawata</groupId>
|
||||||
<artifactId>appdirs</artifactId>
|
<artifactId>appdirs</artifactId>
|
||||||
<version>1.2.1</version>
|
<version>1.2.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.zxing</groupId>
|
<groupId>com.google.zxing</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
<version>3.4.1</version>
|
<version>3.4.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>releaseDir</id>
|
<id>releaseDir</id>
|
||||||
@ -138,11 +139,11 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<source>17</source>
|
<source>17</source>
|
||||||
<additionalOptions>-html5</additionalOptions>
|
<additionalOptions>-html5</additionalOptions>
|
||||||
<level>public</level>
|
<level>public</level>
|
||||||
<verbose>false</verbose>
|
<verbose>false</verbose>
|
||||||
<quiet>true</quiet>
|
<quiet>true</quiet>
|
||||||
<additionalOptions>-Xdoclint:none</additionalOptions>
|
<additionalOptions>-Xdoclint:none</additionalOptions>
|
||||||
<additionalJOption>-Xdoclint:none</additionalJOption>
|
<additionalJOption>-Xdoclint:none</additionalJOption>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
@ -177,7 +178,7 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
<!-- compile sources -->
|
<!-- compile sources -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.8.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
@ -194,20 +195,20 @@
|
|||||||
<!-- specify source/target for IDE integration -->
|
<!-- specify source/target for IDE integration -->
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>9</release>
|
<release>9</release>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
<!-- compile sources with Java 11 -->
|
<!-- compile sources with Java 11 -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>java-11-module-compile</id>
|
<id>java-11-module-compile</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>compile</goal>
|
<goal>compile</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>11</release>
|
<release>11</release>
|
||||||
<compileSourceRoots>
|
<compileSourceRoots>
|
||||||
<compileSourceRoot>${project.basedir}/../src/main/java11</compileSourceRoot>
|
<compileSourceRoot>${project.basedir}/../src/main/java11</compileSourceRoot>
|
||||||
</compileSourceRoots>
|
</compileSourceRoots>
|
||||||
<multiReleaseOutput>true</multiReleaseOutput>
|
<multiReleaseOutput>true</multiReleaseOutput>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
<!-- compile sources with Java 9 to generate and validate module-info.java -->
|
<!-- compile sources with Java 9 to generate and validate module-info.java -->
|
||||||
@ -228,7 +229,7 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- specify JDK 9+ release flag to ensure no classes/methods later than Java 8 are used accidentally -->
|
<!-- specify JDK 9+ release flag to ensure no classes/methods later than Java 8 are used accidentally -->
|
||||||
<release>8</release>
|
<release>8</release>
|
||||||
<!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
|
<!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>it/tdlight/tdlight/ClientManager.java</exclude>
|
<exclude>it/tdlight/tdlight/ClientManager.java</exclude>
|
||||||
@ -266,13 +267,13 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>3.2.0</version>
|
<version>3.2.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Multi-Release>true</Multi-Release>
|
<Multi-Release>true</Multi-Release>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-install-plugin</artifactId>
|
<artifactId>maven-install-plugin</artifactId>
|
||||||
@ -298,24 +299,24 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>properties-maven-plugin</artifactId>
|
<artifactId>properties-maven-plugin</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>initialize</phase>
|
<phase>initialize</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>read-project-properties</goal>
|
<goal>read-project-properties</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<files>
|
<files>
|
||||||
<file>${basedir}/../nativesBuildNumber.properties</file>
|
<file>${basedir}/../nativesBuildNumber.properties</file>
|
||||||
</files>
|
</files>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
283
tdlight/pom.xml
283
tdlight/pom.xml
@ -1,17 +1,18 @@
|
|||||||
<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
|
||||||
<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>${revision}</version>
|
<version>${revision}</version>
|
||||||
<name>TDLight Java Wrapper</name>
|
<name>TDLight Java Wrapper</name>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<revision>1.0.0.0-SNAPSHOT</revision>
|
<revision>1.0.0.0-SNAPSHOT</revision>
|
||||||
<nativesRevisionNumber>0</nativesRevisionNumber>
|
<nativesRevisionNumber>0</nativesRevisionNumber>
|
||||||
<nativesRevisionSuffix>-SNAPSHOT</nativesRevisionSuffix>
|
<nativesRevisionSuffix>-SNAPSHOT</nativesRevisionSuffix>
|
||||||
<apiRevisionNumber>0</apiRevisionNumber>
|
<apiRevisionNumber>0</apiRevisionNumber>
|
||||||
<apiRevisionSuffix>-SNAPSHOT</apiRevisionSuffix>
|
<apiRevisionSuffix>-SNAPSHOT</apiRevisionSuffix>
|
||||||
</properties>
|
</properties>
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
@ -67,15 +68,15 @@
|
|||||||
<artifactId>reactive-streams</artifactId>
|
<artifactId>reactive-streams</artifactId>
|
||||||
<version>1.0.3</version>
|
<version>1.0.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.harawata</groupId>
|
<groupId>net.harawata</groupId>
|
||||||
<artifactId>appdirs</artifactId>
|
<artifactId>appdirs</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.zxing</groupId>
|
<groupId>com.google.zxing</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -83,16 +84,16 @@
|
|||||||
<artifactId>fastutil</artifactId>
|
<artifactId>fastutil</artifactId>
|
||||||
<version>8.5.6</version>
|
<version>8.5.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.harawata</groupId>
|
<groupId>net.harawata</groupId>
|
||||||
<artifactId>appdirs</artifactId>
|
<artifactId>appdirs</artifactId>
|
||||||
<version>1.2.1</version>
|
<version>1.2.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.zxing</groupId>
|
<groupId>com.google.zxing</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
<version>3.4.1</version>
|
<version>3.4.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
<profiles>
|
<profiles>
|
||||||
@ -138,12 +139,12 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<source>17</source>
|
<source>17</source>
|
||||||
<additionalOptions>-html5</additionalOptions>
|
<additionalOptions>-html5</additionalOptions>
|
||||||
<level>public</level>
|
<level>public</level>
|
||||||
<verbose>false</verbose>
|
<verbose>false</verbose>
|
||||||
<quiet>true</quiet>
|
<quiet>true</quiet>
|
||||||
<additionalOptions>-Xdoclint:none</additionalOptions>
|
<additionalOptions>-Xdoclint:none</additionalOptions>
|
||||||
<additionalJOption>-Xdoclint:none</additionalJOption>
|
<additionalJOption>-Xdoclint:none</additionalJOption>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>attach-javadocs</id>
|
<id>attach-javadocs</id>
|
||||||
@ -153,91 +154,91 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- ensure the project is compiling with JDK 9+ -->
|
<!-- ensure the project is compiling with JDK 9+ -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
<artifactId>maven-enforcer-plugin</artifactId>
|
||||||
<version>3.0.0-M3</version>
|
<version>3.0.0-M3</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>enforce-jdk9</id>
|
<id>enforce-jdk9</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>enforce</goal>
|
<goal>enforce</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<rules>
|
<rules>
|
||||||
<requireJavaVersion>
|
<requireJavaVersion>
|
||||||
<version>[1.9,)</version>
|
<version>[1.9,)</version>
|
||||||
<message>JDK 9+ is required for compilation</message>
|
<message>JDK 9+ is required for compilation</message>
|
||||||
</requireJavaVersion>
|
</requireJavaVersion>
|
||||||
</rules>
|
</rules>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- compile sources -->
|
<!-- compile sources -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.8.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>it/tdlight/tdlib/ClientManager.java</exclude>
|
<exclude>it/tdlight/tdlib/ClientManager.java</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<!-- disable default phase due to fixed id and position in lifecycle -->
|
<!-- disable default phase due to fixed id and position in lifecycle -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>default-compile</id>
|
<id>default-compile</id>
|
||||||
<phase>none</phase>
|
<phase>none</phase>
|
||||||
<!-- specify source/target for IDE integration -->
|
<!-- specify source/target for IDE integration -->
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>9</release>
|
<release>9</release>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
<!-- compile sources with Java 11 -->
|
<!-- compile sources with Java 11 -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>java-11-module-compile</id>
|
<id>java-11-module-compile</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>compile</goal>
|
<goal>compile</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>11</release>
|
<release>11</release>
|
||||||
<compileSourceRoots>
|
<compileSourceRoots>
|
||||||
<compileSourceRoot>${project.basedir}/../src/main/java11</compileSourceRoot>
|
<compileSourceRoot>${project.basedir}/../src/main/java11</compileSourceRoot>
|
||||||
</compileSourceRoots>
|
</compileSourceRoots>
|
||||||
<multiReleaseOutput>true</multiReleaseOutput>
|
<multiReleaseOutput>true</multiReleaseOutput>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
<!-- compile sources with Java 9 to generate and validate module-info.java -->
|
<!-- compile sources with Java 9 to generate and validate module-info.java -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>java-9-module-compile</id>
|
<id>java-9-module-compile</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>compile</goal>
|
<goal>compile</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<release>9</release>
|
<release>9</release>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
<!-- recompile sources as Java 8 to overwrite Java 9 class files, except module-info.java -->
|
<!-- recompile sources as Java 8 to overwrite Java 9 class files, except module-info.java -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>java-8-compile</id>
|
<id>java-8-compile</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>compile</goal>
|
<goal>compile</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- specify JDK 9+ release flag to ensure no classes/methods later than Java 8 are used accidentally -->
|
<!-- specify JDK 9+ release flag to ensure no classes/methods later than Java 8 are used accidentally -->
|
||||||
<release>8</release>
|
<release>8</release>
|
||||||
<!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
|
<!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>it/tdlight/tdlib/ClientManager.java</exclude>
|
<exclude>it/tdlight/tdlib/ClientManager.java</exclude>
|
||||||
<exclude>module-info.java</exclude>
|
<exclude>module-info.java</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>flatten-maven-plugin</artifactId>
|
<artifactId>flatten-maven-plugin</artifactId>
|
||||||
@ -266,13 +267,13 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>3.2.0</version>
|
<version>3.2.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<archive>
|
<archive>
|
||||||
<manifestEntries>
|
<manifestEntries>
|
||||||
<Multi-Release>true</Multi-Release>
|
<Multi-Release>true</Multi-Release>
|
||||||
</manifestEntries>
|
</manifestEntries>
|
||||||
</archive>
|
</archive>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-install-plugin</artifactId>
|
<artifactId>maven-install-plugin</artifactId>
|
||||||
@ -298,24 +299,24 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>properties-maven-plugin</artifactId>
|
<artifactId>properties-maven-plugin</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>initialize</phase>
|
<phase>initialize</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>read-project-properties</goal>
|
<goal>read-project-properties</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<files>
|
<files>
|
||||||
<file>${basedir}/../nativesBuildNumber.properties</file>
|
<file>${basedir}/../nativesBuildNumber.properties</file>
|
||||||
</files>
|
</files>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
Loading…
Reference in New Issue
Block a user