Remove unused variants
This commit is contained in:
Andrea Cavalli
parent
17d55599d2
commit
57a2214c70
4
.gitignore
vendored
4
.gitignore
vendored
@ -91,3 +91,7 @@ parent/.classpath
|
|||||||
|
|
||||||
*.iml
|
*.iml
|
||||||
|
|
||||||
|
|
||||||
|
tdlight-java/target-snapshot/
|
||||||
|
|
||||||
|
tdlight-java-8/target-snapshot/
|
||||||
|
|||||||
68
bom/pom.xml
68
bom/pom.xml
@ -7,10 +7,10 @@
|
|||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>TDLight Java BOM</name>
|
<name>TDLight Java BOM</name>
|
||||||
<properties>
|
<properties>
|
||||||
<revision>1.0.0.0-SNAPSHOT</revision>
|
<revision>1.1.0.0-SNAPSHOT</revision>
|
||||||
<nativesSsl3Suffix/>
|
<nativesSsl3Suffix/>
|
||||||
<nativesRevisionNumber>299</nativesRevisionNumber>
|
<nativesRevisionNumber>307</nativesRevisionNumber>
|
||||||
<apiRevisionNumber>297</apiRevisionNumber>
|
<apiRevisionNumber>305</apiRevisionNumber>
|
||||||
<nativesRevisionSuffix/>
|
<nativesRevisionSuffix/>
|
||||||
<tdlight.natives.version>4.0.${nativesRevisionNumber}${nativesRevisionSuffix}</tdlight.natives.version>
|
<tdlight.natives.version>4.0.${nativesRevisionNumber}${nativesRevisionSuffix}</tdlight.natives.version>
|
||||||
<tdlight.natives.ssl3.version>4.0.${nativesRevisionNumber}${nativesSsl3Suffix}${nativesRevisionSuffix}</tdlight.natives.ssl3.version>
|
<tdlight.natives.ssl3.version>4.0.${nativesRevisionNumber}${nativesSsl3Suffix}${nativesRevisionSuffix}</tdlight.natives.ssl3.version>
|
||||||
@ -51,12 +51,9 @@
|
|||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.zxing</groupId>
|
<!-- TDLight packages and APIs -->
|
||||||
<artifactId>core</artifactId>
|
|
||||||
<version>3.5.0</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>it.tdlight</groupId>
|
<groupId>it.tdlight</groupId>
|
||||||
<artifactId>tdlight-api-legacy</artifactId>
|
<artifactId>tdlight-api-legacy</artifactId>
|
||||||
@ -87,21 +84,11 @@
|
|||||||
<artifactId>tdlight-java-8</artifactId>
|
<artifactId>tdlight-java-8</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-java</artifactId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>it.tdlight</groupId>
|
<groupId>it.tdlight</groupId>
|
||||||
<artifactId>tdlight-java-parent</artifactId>
|
<artifactId>tdlight-java-parent</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-java-parent</artifactId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- TDLight natives -->
|
<!-- TDLight natives -->
|
||||||
|
|
||||||
@ -146,49 +133,6 @@
|
|||||||
<version>${tdlight.natives.version}</version>
|
<version>${tdlight.natives.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- TDLib natives -->
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-linux-amd64</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-linux-aarch64</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-linux-x86</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-linux-armhf</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-linux-ppc64le</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-linux-s390x</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-windows-amd64</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlib-natives-osx-amd64</artifactId>
|
|
||||||
<version>${tdlight.natives.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>it.tdlight</groupId>
|
<groupId>it.tdlight</groupId>
|
||||||
<artifactId>example-java</artifactId>
|
<artifactId>example-java</artifactId>
|
||||||
<version>1.0.0.0-SNAPSHOT</version>
|
<version>1.1.0.0-SNAPSHOT</version>
|
||||||
<name>TDLight Java Example</name>
|
<name>TDLight Java Example</name>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
|
|||||||
@ -11,10 +11,14 @@
|
|||||||
<relativePath>../bom/pom.xml</relativePath>
|
<relativePath>../bom/pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<properties>
|
<properties>
|
||||||
<revision>1.0.0.0-SNAPSHOT</revision>
|
<revision>1.1.0.0-SNAPSHOT</revision>
|
||||||
|
<zxing.version>3.5.0</zxing.version>
|
||||||
|
<reactive.streams.version>1.0.4</reactive.streams.version>
|
||||||
|
<slf4j.api.version>2.0.5</slf4j.api.version>
|
||||||
|
<junit.jupiter.engine.version>5.9.0</junit.jupiter.engine.version>
|
||||||
|
<fastutil.core.version>8.5.11</fastutil.core.version>
|
||||||
</properties>
|
</properties>
|
||||||
<modules>
|
<modules>
|
||||||
<!--disabled: <module>../tdlib</module>-->
|
|
||||||
<module>../tdlight-java</module>
|
<module>../tdlight-java</module>
|
||||||
<module>../tdlight-java-8</module>
|
<module>../tdlight-java-8</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|||||||
@ -1,16 +0,0 @@
|
|||||||
package it.tdlight.common.utils;
|
|
||||||
|
|
||||||
public final class LibraryVersion {
|
|
||||||
|
|
||||||
public static final String VERSION = "${project.version}";
|
|
||||||
public static final String NATIVES_VERSION = "4.0.${nativesRevisionNumber}${nativesRevisionSuffix}";
|
|
||||||
public static final String IMPLEMENTATION_NAME = "tdlib";
|
|
||||||
public static final String LINUX_X86_CLASS = "it.tdlight.jni.tdlib.linux.x86.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
public static final String LINUX_AMD64_CLASS = "it.tdlight.jni.tdlib.linux.amd64.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
public static final String LINUX_AARCH64_CLASS = "it.tdlight.jni.tdlib.linux.aarch64.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
public static final String LINUX_ARMHF_CLASS = "it.tdlight.jni.tdlib.linux.armhf.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
public static final String LINUX_S390X_CLASS = "it.tdlight.jni.tdlib.linux.s390x.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
public static final String LINUX_PPC64LE_CLASS = "it.tdlight.jni.tdlib.linux.ppc64le.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
public static final String WINDOWS_AMD64_CLASS = "it.tdlight.jni.tdlib.win.amd64.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
public static final String OSX_AMD64_CLASS = "it.tdlight.jni.tdlib.osx.amd64.v4_0_${nativesRevisionNumber}.LoadLibrary";
|
|
||||||
}
|
|
||||||
151
tdlib/.gitignore
vendored
151
tdlib/.gitignore
vendored
@ -1,151 +0,0 @@
|
|||||||
# ---> Eclipse
|
|
||||||
*.pydevproject
|
|
||||||
.metadata
|
|
||||||
.gradle
|
|
||||||
bin/
|
|
||||||
tmp/
|
|
||||||
*.tmp
|
|
||||||
*.bak
|
|
||||||
*.swp
|
|
||||||
*~.nib
|
|
||||||
local.properties
|
|
||||||
.settings/
|
|
||||||
.loadpath
|
|
||||||
|
|
||||||
# Eclipse Core
|
|
||||||
.project
|
|
||||||
|
|
||||||
# External tool builders
|
|
||||||
.externalToolBuilders/
|
|
||||||
|
|
||||||
# Locally stored "Eclipse launch configurations"
|
|
||||||
*.launch
|
|
||||||
|
|
||||||
# CDT-specific
|
|
||||||
.cproject
|
|
||||||
|
|
||||||
# JDT-specific (Eclipse Java Development Tools)
|
|
||||||
.classpath
|
|
||||||
|
|
||||||
# Java annotation processor (APT)
|
|
||||||
.factorypath
|
|
||||||
|
|
||||||
# PDT-specific
|
|
||||||
.buildpath
|
|
||||||
|
|
||||||
# sbteclipse plugin
|
|
||||||
.target
|
|
||||||
|
|
||||||
# TeXlipse plugin
|
|
||||||
.texlipse
|
|
||||||
|
|
||||||
# ---> Java
|
|
||||||
*.class
|
|
||||||
|
|
||||||
# Mobile Tools for Java (J2ME)
|
|
||||||
.mtj.tmp/
|
|
||||||
|
|
||||||
# Package Files #
|
|
||||||
*.jar
|
|
||||||
*.war
|
|
||||||
*.ear
|
|
||||||
|
|
||||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
|
||||||
hs_err_pid*
|
|
||||||
|
|
||||||
# ---> Maven
|
|
||||||
target/
|
|
||||||
pom.xml.tag
|
|
||||||
pom.xml.releaseBackup
|
|
||||||
pom.xml.versionsBackup
|
|
||||||
pom.xml.next
|
|
||||||
release.properties
|
|
||||||
dependency-reduced-pom.xml
|
|
||||||
buildNumber.properties
|
|
||||||
.mvn/timing.properties
|
|
||||||
|
|
||||||
# Created by https://www.gitignore.io/api/intellij+all
|
|
||||||
|
|
||||||
### Intellij+all ###
|
|
||||||
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
|
|
||||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
|
||||||
|
|
||||||
# User-specific stuff
|
|
||||||
.idea/**/workspace.xml
|
|
||||||
.idea/**/tasks.xml
|
|
||||||
.idea/**/usage.statistics.xml
|
|
||||||
.idea/**/dictionaries
|
|
||||||
.idea/**/shelf
|
|
||||||
|
|
||||||
# Generated files
|
|
||||||
.idea/**/contentModel.xml
|
|
||||||
|
|
||||||
# Sensitive or high-churn files
|
|
||||||
.idea/**/dataSources/
|
|
||||||
.idea/**/dataSources.ids
|
|
||||||
.idea/**/dataSources.local.xml
|
|
||||||
.idea/**/sqlDataSources.xml
|
|
||||||
.idea/**/dynamic.xml
|
|
||||||
.idea/**/uiDesigner.xml
|
|
||||||
.idea/**/dbnavigator.xml
|
|
||||||
|
|
||||||
# Gradle
|
|
||||||
.idea/**/gradle.xml
|
|
||||||
.idea/**/libraries
|
|
||||||
|
|
||||||
# Gradle and Maven with auto-import
|
|
||||||
# When using Gradle or Maven with auto-import, you should exclude module files,
|
|
||||||
# since they will be recreated, and may cause churn. Uncomment if using
|
|
||||||
# auto-import.
|
|
||||||
# .idea/modules.xml
|
|
||||||
# .idea/*.iml
|
|
||||||
# .idea/modules
|
|
||||||
|
|
||||||
# CMake
|
|
||||||
cmake-build-*/
|
|
||||||
|
|
||||||
# Mongo Explorer plugin
|
|
||||||
.idea/**/mongoSettings.xml
|
|
||||||
|
|
||||||
# File-based project format
|
|
||||||
*.iws
|
|
||||||
|
|
||||||
# IntelliJ
|
|
||||||
out/
|
|
||||||
|
|
||||||
# mpeltonen/sbt-idea plugin
|
|
||||||
.idea_modules/
|
|
||||||
|
|
||||||
# JIRA plugin
|
|
||||||
atlassian-ide-plugin.xml
|
|
||||||
|
|
||||||
# Cursive Clojure plugin
|
|
||||||
.idea/replstate.xml
|
|
||||||
|
|
||||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
|
||||||
com_crashlytics_export_strings.xml
|
|
||||||
crashlytics.properties
|
|
||||||
crashlytics-build.properties
|
|
||||||
fabric.properties
|
|
||||||
|
|
||||||
# Editor-based Rest Client
|
|
||||||
.idea/httpRequests
|
|
||||||
|
|
||||||
# Android studio 3.1+ serialized cache file
|
|
||||||
.idea/caches/build_file_checksums.ser
|
|
||||||
|
|
||||||
### Intellij+all Patch ###
|
|
||||||
# Ignores the whole .idea folder and all .iml files
|
|
||||||
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
|
|
||||||
|
|
||||||
.idea/
|
|
||||||
|
|
||||||
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
|
|
||||||
|
|
||||||
*.iml
|
|
||||||
modules.xml
|
|
||||||
.idea/misc.xml
|
|
||||||
*.ipr
|
|
||||||
|
|
||||||
|
|
||||||
# End of https://www.gitignore.io/api/intellij+all
|
|
||||||
313
tdlib/pom.xml
313
tdlib/pom.xml
@ -1,313 +0,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/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>tdlib-java</artifactId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
<name>TDLib Java Wrapper</name>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<parent>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
<artifactId>tdlight-java-parent</artifactId>
|
|
||||||
<relativePath>../parent/pom.xml</relativePath>
|
|
||||||
</parent>
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<revision>1.0.0.0-SNAPSHOT</revision>
|
|
||||||
<nativesSsl3Suffix/>
|
|
||||||
<tdlib.api.artifact.id>tdlib-api-legacy</tdlib.api.artifact.id>
|
|
||||||
</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>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>${tdlib.api.artifact.id}</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-api</artifactId>
|
|
||||||
<version>2.0.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.reactivestreams</groupId>
|
|
||||||
<artifactId>reactive-streams</artifactId>
|
|
||||||
<version>1.0.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.zxing</groupId>
|
|
||||||
<artifactId>core</artifactId>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.junit.jupiter</groupId>
|
|
||||||
<artifactId>junit-jupiter-engine</artifactId>
|
|
||||||
<version>5.8.2</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.unimi.dsi</groupId>
|
|
||||||
<artifactId>fastutil-core</artifactId>
|
|
||||||
<version>8.5.11</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>it.tdlight</groupId>
|
|
||||||
<artifactId>tdlight-java-bom</artifactId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>releaseDir</id>
|
|
||||||
<build>
|
|
||||||
<directory>target-release</directory>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>snapshotDir</id>
|
|
||||||
<build>
|
|
||||||
<directory>target-snapshot</directory>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>jdk-with-sealed-interfaces</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>[17,)</jdk>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
|
||||||
<tdlib.api.artifact.id>tdlib-api-sealed</tdlib.api.artifact.id>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
<profile>
|
|
||||||
<id>jdk-with-legacy-interfaces</id>
|
|
||||||
<activation>
|
|
||||||
<jdk>(,17)</jdk>
|
|
||||||
</activation>
|
|
||||||
<properties>
|
|
||||||
<tdlib.api.artifact.id>tdlib-api-legacy</tdlib.api.artifact.id>
|
|
||||||
</properties>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
<build>
|
|
||||||
<sourceDirectory>../src/main/java</sourceDirectory>
|
|
||||||
<testSourceDirectory>../src/test/java</testSourceDirectory>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
|
||||||
<version>3.1.0</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
|
||||||
<version>3.0.2</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
|
||||||
<version>3.2.1</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>attach-sources</id>
|
|
||||||
<goals>
|
|
||||||
<goal>jar</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
|
||||||
<version>3.4.1</version>
|
|
||||||
<configuration>
|
|
||||||
<source>17</source>
|
|
||||||
<additionalOptions>-html5</additionalOptions>
|
|
||||||
<level>public</level>
|
|
||||||
<verbose>false</verbose>
|
|
||||||
<quiet>true</quiet>
|
|
||||||
<additionalOptions>-Xdoclint:none</additionalOptions>
|
|
||||||
<additionalJOption>-Xdoclint:none</additionalJOption>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>attach-javadocs</id>
|
|
||||||
<goals>
|
|
||||||
<goal>jar</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- ensure the project is compiling with JDK 9+ -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
|
||||||
<version>3.0.0-M3</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>enforce-jdk9</id>
|
|
||||||
<goals>
|
|
||||||
<goal>enforce</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<rules>
|
|
||||||
<requireJavaVersion>
|
|
||||||
<version>[1.9,)</version>
|
|
||||||
<message>JDK 9+ is required for compilation</message>
|
|
||||||
</requireJavaVersion>
|
|
||||||
</rules>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- compile sources -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<version>3.8.1</version>
|
|
||||||
<configuration>
|
|
||||||
<encoding>UTF-8</encoding>
|
|
||||||
<excludes>
|
|
||||||
<exclude>it/tdlight/tdlight/ClientManager.java</exclude>
|
|
||||||
</excludes>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<!-- disable default phase due to fixed id and position in lifecycle -->
|
|
||||||
<execution>
|
|
||||||
<id>default-compile</id>
|
|
||||||
<phase>none</phase>
|
|
||||||
<!-- specify source/target for IDE integration -->
|
|
||||||
<configuration>
|
|
||||||
<release>9</release>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<!-- compile sources with Java 11 -->
|
|
||||||
<execution>
|
|
||||||
<id>java-11-module-compile</id>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<release>11</release>
|
|
||||||
<compileSourceRoots>
|
|
||||||
<compileSourceRoot>../src/main/java11</compileSourceRoot>
|
|
||||||
</compileSourceRoots>
|
|
||||||
<multiReleaseOutput>true</multiReleaseOutput>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<!-- compile sources with Java 9 to generate and validate module-info.java -->
|
|
||||||
<execution>
|
|
||||||
<id>java-9-module-compile</id>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<release>9</release>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<!-- recompile sources as Java 8 to overwrite Java 9 class files, except module-info.java -->
|
|
||||||
<execution>
|
|
||||||
<id>java-8-compile</id>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<!-- specify JDK 9+ release flag to ensure no classes/methods later than Java 8 are used accidentally -->
|
|
||||||
<release>8</release>
|
|
||||||
<!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
|
|
||||||
<excludes>
|
|
||||||
<exclude>it/tdlight/tdlight/ClientManager.java</exclude>
|
|
||||||
<exclude>module-info.java</exclude>
|
|
||||||
</excludes>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>flatten-maven-plugin</artifactId>
|
|
||||||
<version>1.1.0</version>
|
|
||||||
<configuration>
|
|
||||||
<updatePomFile>true</updatePomFile>
|
|
||||||
<flattenMode>oss</flattenMode>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>flatten</id>
|
|
||||||
<phase>process-resources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>flatten</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>flatten.clean</id>
|
|
||||||
<phase>clean</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>clean</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<version>3.2.0</version>
|
|
||||||
<configuration>
|
|
||||||
<archive>
|
|
||||||
<manifestEntries>
|
|
||||||
<Multi-Release>true</Multi-Release>
|
|
||||||
</manifestEntries>
|
|
||||||
</archive>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-install-plugin</artifactId>
|
|
||||||
<version>3.0.0-M1</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
|
||||||
<version>2.8.2</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
|
||||||
<version>3.0.0-M5</version>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.junit.jupiter</groupId>
|
|
||||||
<artifactId>junit-jupiter-engine</artifactId>
|
|
||||||
<version>5.8.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
|
||||||
@ -12,7 +12,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
<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.1.0.0-SNAPSHOT</revision>
|
||||||
<nativesSsl3Suffix/>
|
<nativesSsl3Suffix/>
|
||||||
</properties>
|
</properties>
|
||||||
<repositories>
|
<repositories>
|
||||||
@ -52,28 +52,29 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>2.0.5</version>
|
<version>${slf4j.api.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.reactivestreams</groupId>
|
<groupId>org.reactivestreams</groupId>
|
||||||
<artifactId>reactive-streams</artifactId>
|
<artifactId>reactive-streams</artifactId>
|
||||||
<version>1.0.4</version>
|
<version>${reactive.streams.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.zxing</groupId>
|
<groupId>com.google.zxing</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
|
<version>${zxing.version}</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter-engine</artifactId>
|
<artifactId>junit-jupiter-engine</artifactId>
|
||||||
<version>5.9.0</version>
|
<version>${junit.jupiter.engine.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>it.unimi.dsi</groupId>
|
<groupId>it.unimi.dsi</groupId>
|
||||||
<artifactId>fastutil-core</artifactId>
|
<artifactId>fastutil-core</artifactId>
|
||||||
<version>8.5.11</version>
|
<version>${fastutil.core.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
<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.1.0.0-SNAPSHOT</revision>
|
||||||
<nativesSsl3Suffix/>
|
<nativesSsl3Suffix/>
|
||||||
</properties>
|
</properties>
|
||||||
<repositories>
|
<repositories>
|
||||||
@ -52,28 +52,29 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>2.0.5</version>
|
<version>${slf4j.api.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.reactivestreams</groupId>
|
<groupId>org.reactivestreams</groupId>
|
||||||
<artifactId>reactive-streams</artifactId>
|
<artifactId>reactive-streams</artifactId>
|
||||||
<version>1.0.4</version>
|
<version>${reactive.streams.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.zxing</groupId>
|
<groupId>com.google.zxing</groupId>
|
||||||
<artifactId>core</artifactId>
|
<artifactId>core</artifactId>
|
||||||
|
<version>${zxing.version}</version>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter-engine</artifactId>
|
<artifactId>junit-jupiter-engine</artifactId>
|
||||||
<version>5.9.0</version>
|
<version>${junit.jupiter.engine.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>it.unimi.dsi</groupId>
|
<groupId>it.unimi.dsi</groupId>
|
||||||
<artifactId>fastutil-core</artifactId>
|
<artifactId>fastutil-core</artifactId>
|
||||||
<version>8.5.11</version>
|
<version>${fastutil.core.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user