diff --git a/CHANGELOG.md b/CHANGELOG.md index 87f1b2f745f..531d3046059 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v0.3.4 (Oct 2017) ## + * Intermediate release + ## v0.3.2 (Sep 2017) ## * Bug fixes diff --git a/gradle.properties b/gradle.properties index bf4bc779171..f1e70be83fe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ kotlinVersion=1.1-20171004.235336-906 kotlinScriptRuntimeVersion=1.1-20171004.235353-597 kotlinStdLibVersion=1.1-20171004.235357-905 kotlinReflectVersion=1.1-20171004.235348-905 -konanVersion=0.3.3 +konanVersion=0.3.4 org.gradle.jvmargs='-Dfile.encoding=UTF-8' ## diff --git a/tools/publish-release.sh b/tools/publish-release.sh index 09adbabd72b..6fd1e56cbb8 100755 --- a/tools/publish-release.sh +++ b/tools/publish-release.sh @@ -54,6 +54,7 @@ REPO="https://github.com/JetBrains/kotlin-native.git" TREE_DIR=${PWD} BUNDLE_TAR="$TREE_DIR/kotlin-native-$OS-$VERSION.tar.gz" BUNDLE_DIR="$TREE_DIR/kotlin-native-$OS-$VERSION" +WAIT_TIME=60 # Build and test. @@ -93,6 +94,7 @@ if [ "$UPLOAD" == "true" ]; then export BINTRAY_KEY ./gradlew :tools:kotlin-native-gradle-plugin:bintrayUpload -Poverride fi +sleep 10 # Wait some time to ensure that the plugin can be downloaded on the following step. # 5. Build the bundle samples with the plugin stage "Building samples with gradle plugin and bundle compiler" @@ -104,8 +106,10 @@ if [ "$UPLOAD" == "true" ]; then stage "Uploading the bundle to CDN: $BUNDLE_TAR -> ftp://upload.cds.intellij.net/kotlin/native/" curl --upload-file "$BUNDLE_TAR" "ftp://$CDN_USER:$CDN_PASS@upload.cds.intellij.net/kotlin/native/" fi +echo "Wait ${WAIT_TIME} seconds to ensure that the bundle can be downloaded." +sleep ${WAIT_TIME} -# 7. Remove gradle.properties and build the bundle samples wiht gradle plugin. +# 7. Remove gradle.properties and build the bundle samples with gradle plugin. stage "Building samples with gradle plugin and downloaded compiler" cd "$BUNDLE_DIR/samples" rm -rf gradle.properties