Merge pull request #62 from XYOracleNetwork/develop

Develop
XYOracleNetwork · Jan 31, 2020 · b69ed93 · b69ed93
2 parents 119a353 + ee78804
commit b69ed93
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,14 +29,6 @@ jobs:
           BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
           BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
         run: ./gradlew :ble-android-library:bintrayUpload
-
-      - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WITH_V: false
-          CUSTOM_TAG: ${{ steps.release_version.outputs }}
-          DEFAULT_BUMP: patch
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1

diff --git a/README.md b/README.md
@@ -4,12 +4,12 @@
 
 # XYO Bluetooth SDK
 
-[![](https://jitpack.io/v/XYOracleNetwork/sdk-ble-android.svg)](https://jitpack.io/#XYOracleNetwork/sdk-ble-android)
+![](https://github.com/XYOracleNetwork/sdk-xyo-android/workflows/CI/badge.svg?branch=develop)  ![](https://github.com/XYOracleNetwork/sdk-xyo-android/workflows/Release/badge.svg?branch=master) [![Download](https://api.bintray.com/packages/xyoraclenetwork/xyo/sdk-ble-android/images/download.svg)](https://bintray.com/xyoraclenetwork/xyo/sdk-ble-android/_latestVersion) [![](https://jitpack.io/v/XYOracleNetwork/sdk-ble-android.svg)](https://jitpack.io/#XYOracleNetwork/sdk-ble-android)
 [![Maintainability](https://api.codeclimate.com/v1/badges/73ee685fc9e2c61454b2/maintainability)](https://codeclimate.com/github/XYOracleNetwork/sdk-ble-android/maintainability)
+
 [![BCH compliance](https://bettercodehub.com/edge/badge/XYOracleNetwork/sdk-ble-android?branch=master)](https://bettercodehub.com/results/XYOracleNetwork/sdk-ble-android)
 [![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=XYOracleNetwork_sdk-ble-android&metric=alert_status)](https://sonarcloud.io/dashboard?id=XYOracleNetwork_sdk-ble-android)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b14446847e614a2fae7152892765dac1)](https://www.codacy.com/app/arietrouw/sdk-ble-android?utm_source=github.com&utm_medium=referral&utm_content=XYOracleNetwork/sdk-ble-android&utm_campaign=Badge_Grade)
-[![Build Status](https://travis-ci.com/XYOracleNetwork/sdk-ble-android.svg?branch=master)](https://travis-ci.com/XYOracleNetwork/sdk-ble-android)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b14446847e614a2fae7152892765dac1)](https://www.codacy.com/app/arietrouw/sdk-ble-android?utm_source=github.com&utm_medium=referral&utm_content=XYOracleNetwork/sdk-ble-android&utm_campaign=Badge_Grade) [![Known Vulnerabilities](https://snyk.io/test/github/XYOracleNetwork/sdk-ble-android/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/XYOracleNetwork/sdk-ble-android?targetFile=build.gradle)
 
 ## Table of Contents
 
@@ -56,7 +56,7 @@ allprojects {
 
 ```gradle
 dependencies {
-    implementation 'com.github.XYOracleNetwork:sdk-ble-android:1.0.2'
+    implementation 'com.github.XYOracleNetwork:sdk-ble-android:3.0.1142'
 }
 ```
 

diff --git a/ble-android-library/build.gradle b/ble-android-library/build.gradle
@@ -34,12 +34,12 @@ buildscript {
 
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
-def verString = project.majorVersion + '.' + project.minorVersion + '.' + (project.patchVersion + 1)
+def verString = project.majorVersion + '.' + project.minorVersion + '.' + (project.patchVersion)
 
 task version(type: VersionTask) 
 class VersionTask extends DefaultTask {
 
-    def verString = project.majorVersion + '.' + project.minorVersion + '.' + (project.patchVersion + 1)
+    def verString = project.majorVersion + '.' + project.minorVersion + '.' + (project.patchVersion)
     @TaskAction
     def version() {
         println verString

diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
 project.ext {
     majorVersion = 3
     minorVersion = 0
-    patchVersion = 1140
+    patchVersion = 1142
 }
 
 allprojects {