Skip to content
This repository was archived by the owner on Mar 8, 2024. It is now read-only.

Commit edb2e33

Browse files
committed
master: Update Kotlin to 1.3.61. Attempt to fix circleci config. Incremented the version number ready for the next release.
1 parent 32c2049 commit edb2e33

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

.circleci/config.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,32 @@ jobs:
3838
<<: *setup_config
3939
steps:
4040
- run:
41-
command: |
42-
HTTP_LAST_BUILD=$(curl --write-out "HTTPSTATUS:%{http_code}" \
43-
--request GET \
44-
"$URL_BASE_KEYVALUE/$CIRCLE_PROJECT_REPONAME/$LAST_BUILD_TOKEN")
45-
LAST_BUILD=$(echo $HTTP_LAST_BUILD | sed -e 's/HTTPSTATUS\:.*//g')
46-
STATUS_LAST_BUILD=$(echo $HTTP_LAST_BUILD | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
47-
if [ $STATUS_LAST_BUILD != 200 ]; then
48-
echo -e "Fetching key value for last build failed.\nStatus: $STATUS_LAST_BUILD"
49-
echo "See https://github.com/brightec/KeyValueApi/blob/master/README.md for help"
50-
exit 1
51-
else
52-
echo "export LAST_BUILD=$LAST_BUILD" >> $BASH_ENV
53-
fi
54-
name: Get last build SHA1
55-
- run:
56-
command: |
57-
HTTP_SAVE_LAST_BUILD=$(curl --write-out "HTTPSTATUS:%{http_code}" \
58-
--request POST \
59-
"$URL_BASE_KEYVALUE/$CIRCLE_PROJECT_REPONAME/$LAST_BUILD_TOKEN/$CIRCLE_SHA1")
41+
name: Get last build SHA1
42+
command: |
43+
HTTP_LAST_BUILD=$(curl --write-out "HTTPSTATUS:%{http_code}" \
44+
--request GET \
45+
"$URL_BASE_KEYVALUE/$CIRCLE_PROJECT_REPONAME/$LAST_BUILD_TOKEN")
46+
LAST_BUILD=$(echo $HTTP_LAST_BUILD | sed -e 's/HTTPSTATUS\:.*//g')
47+
STATUS_LAST_BUILD=$(echo $HTTP_LAST_BUILD | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
48+
if [ $STATUS_LAST_BUILD != 200 ]; then
49+
echo -e "Fetching key value for last build failed.\nStatus: $STATUS_LAST_BUILD"
50+
echo "See https://github.com/brightec/KeyValueApi/blob/master/README.md for help"
51+
exit 1
52+
else
53+
echo "export LAST_BUILD=$LAST_BUILD" >> $BASH_ENV
54+
fi
55+
- run:
56+
name: Save current SHA1
57+
command: |
58+
HTTP_SAVE_LAST_BUILD=$(curl --write-out "HTTPSTATUS:%{http_code}" \
59+
--request POST \
60+
"$URL_BASE_KEYVALUE/$CIRCLE_PROJECT_REPONAME/$LAST_BUILD_TOKEN/$CIRCLE_SHA1")
6061
STATUS_SAVE_LAST_BUILD=$(echo $HTTP_SAVE_LAST_BUILD | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
61-
if [ $STATUS_SAVE_LAST_BUILD != 200 ]; then
62-
echo -e "Saving key value for last build failed.\nStatus: $STATUS_SAVE_LAST_BUILD"
63-
echo "See https://github.com/brightec/KeyValueApi/blob/master/README.md for help"
64-
exit 1
65-
fi
66-
name: Save current SHA1
62+
if [ $STATUS_SAVE_LAST_BUILD != 200 ]; then
63+
echo -e "Saving key value for last build failed.\nStatus: $STATUS_SAVE_LAST_BUILD"
64+
echo "See https://github.com/brightec/KeyValueApi/blob/master/README.md for help"
65+
exit 1
66+
fi
6767
- checkout
6868
- run:
6969
name: Check if deployment is required

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.3.61'
33
repositories {
44
google()
55
jcenter()

kbarcode/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ext {
8181
siteUrl = 'https://github.com/brightec/KBarcode'
8282
gitUrl = 'https://github.com/brightec/KBarcode.git'
8383

84-
libraryVersion = '1.1.0'
84+
libraryVersion = '1.1.1'
8585

8686
developerId = 'alistairsykes'
8787
developerName = 'Alistair Sykes'

0 commit comments

Comments
 (0)