Fix revision numbers
This commit is contained in:
parent
c8eb632200
commit
97b28e5cc0
@ -12,6 +12,9 @@ fi
|
|||||||
|
|
||||||
source ./setup-variables.sh
|
source ./setup-variables.sh
|
||||||
FALLBACK_API_TYPE="sealed"
|
FALLBACK_API_TYPE="sealed"
|
||||||
|
SAFE_VERSION_NAME="v4_0_${REVISION}"
|
||||||
|
REVISION_SUFFIX=""
|
||||||
|
REVISION_MVN="4.0.${REVISION}${REVISION_SUFFIX}"
|
||||||
|
|
||||||
if [ -z "${API_TYPE}" ]; then
|
if [ -z "${API_TYPE}" ]; then
|
||||||
cd ../../generated
|
cd ../../generated
|
||||||
@ -19,7 +22,7 @@ else
|
|||||||
cd "../../generated-${API_TYPE}"
|
cd "../../generated-${API_TYPE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mvn -B -DrevisionNumber="${REVISION}" "-D${API_TYPE:-${FALLBACK_API_TYPE}}" -DrevisionSuffix="" clean deploy
|
mvn -B -Drevision="${REVISION_MVN}" -DsafeVersionName="${SAFE_VERSION_NAME}" "-D${API_TYPE:-${FALLBACK_API_TYPE}}" clean deploy
|
||||||
|
|
||||||
echo "Done."
|
echo "Done."
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -9,8 +9,11 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
FALLBACK_API_TYPE="sealed"
|
FALLBACK_API_TYPE="sealed"
|
||||||
|
SAFE_VERSION_NAME="v4_0_0"
|
||||||
|
REVISION_SUFFIX="-SNAPSHOT"
|
||||||
|
REVISION_MVN="4.0.0${REVISION_SUFFIX}"
|
||||||
|
|
||||||
mvn -B "-D${API_TYPE:-${FALLBACK_API_TYPE}}" deploy
|
mvn -B -Drevision="${REVISION_MVN}" -DsafeVersionName="${SAFE_VERSION_NAME}" "-D${API_TYPE:-${FALLBACK_API_TYPE}}" deploy
|
||||||
|
|
||||||
echo "Done."
|
echo "Done."
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -3,13 +3,13 @@
|
|||||||
<groupId>it.tdlight</groupId>
|
<groupId>it.tdlight</groupId>
|
||||||
<artifactId>${IMPLEMENTATION_NAME}-natives-${OPERATING_SYSTEM_NAME}-${CPU_ARCHITECTURE_NAME}</artifactId>
|
<artifactId>${IMPLEMENTATION_NAME}-natives-${OPERATING_SYSTEM_NAME}-${CPU_ARCHITECTURE_NAME}</artifactId>
|
||||||
<!-- Don't change the version! (or change it also in <shadedPattern>) -->
|
<!-- Don't change the version! (or change it also in <shadedPattern>) -->
|
||||||
<version>4.0.${revisionNumber}${revisionSuffix}</version>
|
<version>${revision}</version>
|
||||||
<name>${IMPLEMENTATION_NAME} natives for ${OPERATING_SYSTEM_NAME} (${CPU_ARCHITECTURE_NAME})</name>
|
<name>${IMPLEMENTATION_NAME} natives for ${OPERATING_SYSTEM_NAME} (${CPU_ARCHITECTURE_NAME})</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>
|
||||||
<revisionNumber>0</revisionNumber>
|
<revision>4.0.0-SNAPSHOT</revision>
|
||||||
<revisionSuffix>-SNAPSHOT</revisionSuffix>
|
<safeVersionName>v4_0_0</safeVersionName>
|
||||||
</properties>
|
</properties>
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
<repository>
|
||||||
@ -87,7 +87,7 @@
|
|||||||
<relocations>
|
<relocations>
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>it.tdlight.jni.implementation_name.operating_system_name.cpu_architecture_name.version</pattern>
|
<pattern>it.tdlight.jni.implementation_name.operating_system_name.cpu_architecture_name.version</pattern>
|
||||||
<shadedPattern>it.tdlight.jni.${IMPLEMENTATION_NAME}.${OPERATING_SYSTEM_NAME_SHORT}.${CPU_ARCHITECTURE_NAME}.v4_0_${revisionNumber}</shadedPattern>
|
<shadedPattern>it.tdlight.jni.${IMPLEMENTATION_NAME}.${OPERATING_SYSTEM_NAME_SHORT}.${CPU_ARCHITECTURE_NAME}.${safeVersionName}</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>it.tdlight</groupId>
|
<groupId>it.tdlight</groupId>
|
||||||
<artifactId>${IMPLEMENTATION_NAME}-api-${API_TYPE}</artifactId>
|
<artifactId>${IMPLEMENTATION_NAME}-api-${API_TYPE}</artifactId>
|
||||||
<version>4.0.${revisionNumber}${revisionSuffix}</version>
|
<version>${revision}</version>
|
||||||
<name>${IMPLEMENTATION_NAME} API</name>
|
<name>${IMPLEMENTATION_NAME} API</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>
|
||||||
<revisionNumber>0</revisionNumber>
|
<revision>4.0.0-SNAPSHOT</revision>
|
||||||
<revisionSuffix>-SNAPSHOT</revisionSuffix>
|
<safeVersionName>v4_0_0</safeVersionName>
|
||||||
</properties>
|
</properties>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user