From 51db0abaddea485dc89b1976c29832f4af904604 Mon Sep 17 00:00:00 2001 From: Jeff Lee Date: Tue, 2 May 2017 18:08:25 -0700 Subject: [PATCH] all: version tick to 1.2.0-rc1 Notes: - Mac app is not taggable until full build size is known (will follow in subsequent commit) - Windows app is versioned as 1.2.0, since it's not clear what the installer will do with prerelease suffixes. The Windows app with the final 1.2.0 cored will have a patch version greater than zero. Closes #1150 --- Readme.md | 4 ++-- bin/build-docker-de | 4 ++-- desktop/mac/Chain Core.xcodeproj/project.pbxproj | 4 ++-- desktop/mac/tools/build_chain.sh | 2 +- desktop/windows/ChainPackage/ChainCoreInstaller.wxs | 2 +- docs/core/get-started/sdk.md | 10 +++++----- generated/rev/RevId.java | 2 +- generated/rev/revid.go | 2 +- generated/rev/revid.js | 2 +- generated/rev/revid.rb | 2 +- sdk/java/pom.xml | 2 +- sdk/node/README.md | 2 +- sdk/node/package.json | 2 +- sdk/ruby/README.md | 2 +- sdk/ruby/lib/chain/version.rb | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Readme.md b/Readme.md index 6563c1c8f9..a2197770d7 100644 --- a/Readme.md +++ b/Readme.md @@ -62,7 +62,7 @@ requests from localhost, and the ability to reset the Chain Core. from the chain repository and an output directory: ```sh -$ ./bin/build-cored-release chain-core-server-1.1.4 . +$ ./bin/build-cored-release chain-core-server-1.2.0-rc1 . ``` This will create two binaries in the current directory: @@ -106,7 +106,7 @@ The default build process creates a binary with three build tags enabled for a friendlier experience. To build from source with build tags, use the following command: -> NOTE: when building from source, make sure to check out a specific +> NOTE: when building from source, make sure to check out a specific tag to build. The `main` branch is __not considered__ stable, and may contain in progress features or an inconsistent experience. diff --git a/bin/build-docker-de b/bin/build-docker-de index 11ab178298..dfeb784d59 100755 --- a/bin/build-docker-de +++ b/bin/build-docker-de @@ -7,8 +7,8 @@ cleanup() { } trap cleanup EXIT -imageVersion=${IMAGE_VERSION:-1.1.1} -coredVersion=${CORED_VERSION:-chain-core-server-1.1.3} +imageVersion=${IMAGE_VERSION:-1.2.0-rc1} +coredVersion=${CORED_VERSION:-chain-core-server-1.2.0-rc1} GOOS=linux GOARCH=amd64 bin/build-cored-release "$coredVersion" $CHAIN/docker/de/ docker build --tag chaincore/developer $CHAIN/docker/de/ diff --git a/desktop/mac/Chain Core.xcodeproj/project.pbxproj b/desktop/mac/Chain Core.xcodeproj/project.pbxproj index 080d415747..739121d7e7 100644 --- a/desktop/mac/Chain Core.xcodeproj/project.pbxproj +++ b/desktop/mac/Chain Core.xcodeproj/project.pbxproj @@ -437,7 +437,7 @@ 83FB57281D1B05F000A903A3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - APP_VERSION = 1.1.1; + APP_VERSION = 1.2.0.rc1; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; @@ -463,7 +463,7 @@ 83FB57291D1B05F000A903A3 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - APP_VERSION = 1.1.1; + APP_VERSION = 1.2.0.rc1; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; COMBINE_HIDPI_IMAGES = YES; diff --git a/desktop/mac/tools/build_chain.sh b/desktop/mac/tools/build_chain.sh index cc010eb81d..7a2629afbe 100644 --- a/desktop/mac/tools/build_chain.sh +++ b/desktop/mac/tools/build_chain.sh @@ -9,7 +9,7 @@ export PATH="${PATH}:/usr/local/go/bin" tempBuildPath=`mktemp -d` trap "rm -rf $tempBuildPath" EXIT -"${CHAIN}/bin/build-cored-release" chain-core-server-1.1.3 $tempBuildPath +"${CHAIN}/bin/build-cored-release" chain-core-server-1.2.0-rc1 $tempBuildPath cp -f $tempBuildPath/cored "${TARGET_DIR}/" cp -f $tempBuildPath/corectl "${TARGET_DIR}/" diff --git a/desktop/windows/ChainPackage/ChainCoreInstaller.wxs b/desktop/windows/ChainPackage/ChainCoreInstaller.wxs index 55cba60493..b7b192ce5f 100755 --- a/desktop/windows/ChainPackage/ChainCoreInstaller.wxs +++ b/desktop/windows/ChainPackage/ChainCoreInstaller.wxs @@ -2,7 +2,7 @@ - + diff --git a/docs/core/get-started/sdk.md b/docs/core/get-started/sdk.md index c28c1d1eb0..eac5b7364e 100644 --- a/docs/core/get-started/sdk.md +++ b/docs/core/get-started/sdk.md @@ -19,7 +19,7 @@ The Java SDK is available via [Maven](https://search.maven.org/#search%7Cga%7C1% com.chain chain-sdk-java - 1.1.3 + 1.2.0-rc1 ``` @@ -27,10 +27,10 @@ The Java SDK is available via [Maven](https://search.maven.org/#search%7Cga%7C1% **Gradle** users should add the following to `build.gradle`: ``` -compile 'com.chain:chain-sdk-java:1.1.3' +compile 'com.chain:chain-sdk-java:1.2.0-rc1' ``` -You can also [download the JAR](https://search.maven.org/remotecontent?filepath=com/chain/chain-sdk-java/1.1.3/chain-sdk-java-1.1.3.jar) as a binary. +You can also [download the JAR](https://search.maven.org/remotecontent?filepath=com/chain/chain-sdk-java/1.1.3/chain-sdk-java-1.2.0-rc1.jar) as a binary. ## Node.js @@ -41,7 +41,7 @@ To install, add the `chain-sdk` NPM module to your `package.json`, using a tilde ``` { "dependencies": { - "chain-sdk": "~1.1.0" + "chain-sdk": "~1.2.0-rc1" } } ``` @@ -53,5 +53,5 @@ The Ruby SDK is available [via Rubygems](https://rubygems.org/gems/chain-sdk). R To install, add the following to your `Gemfile`: ``` -gem 'chain-sdk', '~> 1.1.0', require: 'chain' +gem 'chain-sdk', '~> 1.2.0.rc1', require: 'chain' ``` diff --git a/generated/rev/RevId.java b/generated/rev/RevId.java index 2bb1165f42..273b16fa78 100644 --- a/generated/rev/RevId.java +++ b/generated/rev/RevId.java @@ -1,4 +1,4 @@ public final class RevId { - public final String Id = "main/rev3100"; + public final String Id = "main/rev3101"; } diff --git a/generated/rev/revid.go b/generated/rev/revid.go index 4aec7dbf8a..114896a5a3 100644 --- a/generated/rev/revid.go +++ b/generated/rev/revid.go @@ -1,3 +1,3 @@ package rev -const ID string = "main/rev3100" +const ID string = "main/rev3101" diff --git a/generated/rev/revid.js b/generated/rev/revid.js index aab020dda0..7352d0b15f 100644 --- a/generated/rev/revid.js +++ b/generated/rev/revid.js @@ -1,2 +1,2 @@ -export const rev_id = "main/rev3100" +export const rev_id = "main/rev3101" diff --git a/generated/rev/revid.rb b/generated/rev/revid.rb index 545813e027..501b4b531e 100644 --- a/generated/rev/revid.rb +++ b/generated/rev/revid.rb @@ -1,4 +1,4 @@ module Chain::Rev - ID = "main/rev3100".freeze + ID = "main/rev3101".freeze end diff --git a/sdk/java/pom.xml b/sdk/java/pom.xml index b78eb80734..dc2303c14d 100644 --- a/sdk/java/pom.xml +++ b/sdk/java/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.chain chain-sdk-java - 1.1.3 + 1.2.0rc1 jar ${project.groupId}:${project.artifactId} diff --git a/sdk/node/README.md b/sdk/node/README.md index 6c622af85a..4b87425c59 100644 --- a/sdk/node/README.md +++ b/sdk/node/README.md @@ -11,7 +11,7 @@ To install, add the `chain-sdk` NPM module to your `package.json`, using a tilde ``` { "dependencies": { - "chain-sdk": "~1.1.0" + "chain-sdk": "~1.2.0-rc1" } } ``` diff --git a/sdk/node/package.json b/sdk/node/package.json index e058c61fb6..ef7c8f6224 100644 --- a/sdk/node/package.json +++ b/sdk/node/package.json @@ -1,6 +1,6 @@ { "name": "chain-sdk", - "version": "1.1.0", + "version": "1.2.0-rc1", "description": "The Official Node.js SDK for Chain Core", "homepage": "https://github.com/chain/chain/tree/main/sdk/node", "main": "dist/index.js", diff --git a/sdk/ruby/README.md b/sdk/ruby/README.md index 51d9b91430..cbe91ac2c8 100755 --- a/sdk/ruby/README.md +++ b/sdk/ruby/README.md @@ -11,7 +11,7 @@ Ruby 2.0 or greater is required. We strongly recommend upgrading to Ruby 2.1 or For most applications, you can simply add the following to your `Gemfile`: ``` -gem 'chain-sdk', '~> 1.1.1', require: 'chain' +gem 'chain-sdk', '~> 1.2.0.rc1', require: 'chain' ``` ### In your code diff --git a/sdk/ruby/lib/chain/version.rb b/sdk/ruby/lib/chain/version.rb index dd8ed2856b..2b550509a0 100755 --- a/sdk/ruby/lib/chain/version.rb +++ b/sdk/ruby/lib/chain/version.rb @@ -1,3 +1,3 @@ module Chain - VERSION = '1.1.1' + VERSION = '1.2.0.rc1' end