Merge branch 'release/1.0'
This commit is contained in:
commit
fb538e30c1
100
pom.xml
100
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<artifactId>GpxAndroidSdk</artifactId>
|
<artifactId>GpxAndroidSdk</artifactId>
|
||||||
<groupId>me.bvn13.sdk.android.gpx</groupId>
|
<groupId>me.bvn13.sdk.android.gpx</groupId>
|
||||||
<version>1.4</version>
|
<version>1.0</version>
|
||||||
|
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
@ -35,6 +35,7 @@
|
|||||||
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
|
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
|
||||||
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
|
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
|
||||||
<gitflow-maven-plugin.version>1.18.0</gitflow-maven-plugin.version>
|
<gitflow-maven-plugin.version>1.18.0</gitflow-maven-plugin.version>
|
||||||
|
<maven-jar.version>3.3.0</maven-jar.version>
|
||||||
<!-- dependencies -->
|
<!-- dependencies -->
|
||||||
<kotlin-junit.version>1.7.10</kotlin-junit.version>
|
<kotlin-junit.version>1.7.10</kotlin-junit.version>
|
||||||
<jupiter.version>5.8.2</jupiter.version>
|
<jupiter.version>5.8.2</jupiter.version>
|
||||||
@ -99,6 +100,7 @@
|
|||||||
|
|
||||||
<sourceDirectory>src/main/kotlin</sourceDirectory>
|
<sourceDirectory>src/main/kotlin</sourceDirectory>
|
||||||
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
|
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
@ -123,7 +125,7 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>2.22.2</version>
|
<version>${maven-surefire-plugin.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<trimStackTrace>false</trimStackTrace>
|
<trimStackTrace>false</trimStackTrace>
|
||||||
</configuration>
|
</configuration>
|
||||||
@ -153,6 +155,16 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
<jdkVersion>8</jdkVersion>
|
||||||
|
<perPackageOptions>
|
||||||
|
<packageOption>
|
||||||
|
<matchingRegex>com\..*</matchingRegex>
|
||||||
|
<includeNonPublic>true</includeNonPublic>
|
||||||
|
</packageOption>
|
||||||
|
</perPackageOptions>
|
||||||
|
<sourceDirectories>
|
||||||
|
<dir>${project.basedir}/src/main/kotlin</dir>
|
||||||
|
</sourceDirectories>
|
||||||
<dokkaPlugins>
|
<dokkaPlugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.jetbrains.dokka</groupId>
|
<groupId>org.jetbrains.dokka</groupId>
|
||||||
@ -162,6 +174,43 @@
|
|||||||
</dokkaPlugins>
|
</dokkaPlugins>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<version>${maven-jar.version}</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>test-jar</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>dokka-jar</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>jar</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<classifier>javadoc</classifier>
|
||||||
|
<classesDirectory>${project.build.directory}/dokka</classesDirectory>
|
||||||
|
<skipIfEmpty>true</skipIfEmpty>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<archive>
|
||||||
|
<manifest>
|
||||||
|
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
||||||
|
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
|
||||||
|
</manifest>
|
||||||
|
<manifestEntries>
|
||||||
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
|
<Specification-Version>${project.version}</Specification-Version>
|
||||||
|
<Multi-Release>true</Multi-Release>
|
||||||
|
</manifestEntries>
|
||||||
|
</archive>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
@ -234,6 +283,16 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
<jdkVersion>8</jdkVersion>
|
||||||
|
<perPackageOptions>
|
||||||
|
<packageOption>
|
||||||
|
<matchingRegex>com\..*</matchingRegex>
|
||||||
|
<includeNonPublic>true</includeNonPublic>
|
||||||
|
</packageOption>
|
||||||
|
</perPackageOptions>
|
||||||
|
<sourceDirectories>
|
||||||
|
<dir>${project.basedir}/src/main/kotlin</dir>
|
||||||
|
</sourceDirectories>
|
||||||
<dokkaPlugins>
|
<dokkaPlugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.jetbrains.dokka</groupId>
|
<groupId>org.jetbrains.dokka</groupId>
|
||||||
@ -243,6 +302,43 @@
|
|||||||
</dokkaPlugins>
|
</dokkaPlugins>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<version>${maven-jar.version}</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>test-jar</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>dokka-jar</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>jar</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<classifier>javadoc</classifier>
|
||||||
|
<classesDirectory>${project.build.directory}/dokka</classesDirectory>
|
||||||
|
<skipIfEmpty>true</skipIfEmpty>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<archive>
|
||||||
|
<manifest>
|
||||||
|
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
||||||
|
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
|
||||||
|
</manifest>
|
||||||
|
<manifestEntries>
|
||||||
|
<Implementation-Version>${project.version}</Implementation-Version>
|
||||||
|
<Specification-Version>${project.version}</Specification-Version>
|
||||||
|
<Multi-Release>true</Multi-Release>
|
||||||
|
</manifestEntries>
|
||||||
|
</archive>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
|
Loading…
Reference in New Issue
Block a user