Skip to content

Commit

Permalink
Version number changed
Browse files Browse the repository at this point in the history
Retrieving cnc-java dependency by tag name, not including origin/
  • Loading branch information
simonsalykov committed May 10, 2018
1 parent 15fb722 commit 53fd943
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
releaseVersion=2.0.0-RC5
cncJavaBranch=v2.0.0-RC5
releaseVersion=2.0.0-RC6
cncJavaBranch=v2.0.0-RC6
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import org.ajoberstar.grgit.*

cncJavaBranch='master'
cncJavaBranch='v2.0.0-RC6'

buildscript {
repositories {
Expand Down Expand Up @@ -28,7 +28,7 @@ def gitRepo = Grgit.open(dir: cncPath)
if(gitRepo.branch.list().find { it.name == cncJavaBranch })
gitRepo.checkout(branch: cncJavaBranch)
else
gitRepo.checkout(branch: cncJavaBranch, startPoint: 'origin/' + cncJavaBranch, createBranch: true)
gitRepo.checkout(branch: cncJavaBranch, startPoint: cncJavaBranch, createBranch: true)
///////////////////////////////////////
// End cnc-java
///////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/version.number
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0-RC1
2.0.0-RC6

0 comments on commit 53fd943

Please sign in to comment.