diff --git a/.appveyor.yml b/.appveyor.yml index 8223b53b..97d7de29 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,8 +7,8 @@ build_script: - gradlew -PpublishMode build after_build: - - if %APPVEYOR_REPO_TAG%==true ( gradlew -PpublishMode bintrayUpload ) - else ( gradlew -PpublishMode -PVERSION_SUFFIX=-dev bintrayUpload ) + - if %APPVEYOR_REPO_TAG%==true ( gradlew -PpublishMode -PVERSION_SUFFIX bintrayUpload ) + else ( gradlew -PpublishMode bintrayUpload ) - copy libui\build\classes\kotlin\windows\main\libui-cinterop-libui.klib libui-windows.klib - copy libui\build\classes\kotlin\windows\main\libui.klib libui-ktx-windows.klib - 7z a libui-samples-windows.zip diff --git a/.travis.yml b/.travis.yml index 61c80558..1644f615 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,9 @@ after_success: - | if [[ "x${TRAVIS_TAG}" != "x" ]] then - ./gradlew -PpublishMode bintrayUpload + ./gradlew -PpublishMode -PVERSION_SUFFIX bintrayUpload else - ./gradlew -PpublishMode -PVERSION_SUFFIX=-dev bintrayUpload + ./gradlew -PpublishMode bintrayUpload fi - | case "${TRAVIS_OS_NAME}" in diff --git a/gradle.properties b/gradle.properties index 8d280f66..0464e0c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ kotlin.code.style=official LIBUI_VERSION=alpha4.1 GROUP=com.github.msink -VERSION=0.1.0 -VERSION_SUFFIX= +VERSION_NAME=0.1.0 +VERSION_SUFFIX=-dev POM_SCM_URL=https://github.com/msink/kotlin-libui POM_SCM_CONNECTION=scm:git:https://github.com/msink/kotlin-libui.git diff --git a/libui/build.gradle b/libui/build.gradle index c51d58a5..121fc3ef 100644 --- a/libui/build.gradle +++ b/libui/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'maven-publish' apply plugin: 'com.jfrog.bintray' group = GROUP -version = "${VERSION}${VERSION_SUFFIX}" +version = "${VERSION_NAME}${VERSION_SUFFIX}" task downloadArchive(type: Download) { def release = "https://github.com/andlabs/libui/releases/download/$LIBUI_VERSION/libui-$LIBUI_VERSION"