Bump version to 1.4.0-rc2.
PiperOrigin-RevId: 311681131
diff --git a/README.md b/README.md
index 60fed35..50cde68 100644
--- a/README.md
+++ b/README.md
@@ -107,8 +107,8 @@
## Current status
* The latest version is
- [1.4.0-rc1](https://github.com/google/tink/releases/tag/v1.4.0-rc1),
- released on 2020-04-30.
+ [1.4.0-rc2](https://github.com/google/tink/releases/tag/v1.4.0-rc2),
+ released on 2020-05-14.
* [Java and Android](docs/JAVA-HOWTO.md), [C++](docs/CPP-HOWTO.md),
[Obj-C](docs/OBJC-HOWTO.md), [Go](docs/GOLANG-HOWTO.md), and
[Python](g3docs/PYTHON-HOWTO.md) are field tested and ready for production.
diff --git a/apps/paymentmethodtoken/README.md b/apps/paymentmethodtoken/README.md
index 385d2ea..fab00d5 100644
--- a/apps/paymentmethodtoken/README.md
+++ b/apps/paymentmethodtoken/README.md
@@ -3,9 +3,9 @@
## Latest release
The most recent release is
-[1.4.0-rc1](https://github.com/google/tink/releases/tag/v1.4.0-rc1), released
-2020-04-30. API docs can be found
-[here](https://google.github.com/tink/javadoc/apps-paymentmethodtoken/1.4.0-rc1).
+[1.4.0-rc2](https://github.com/google/tink/releases/tag/v1.4.0-rc2), released
+2020-05-14. API docs can be found
+[here](https://google.github.com/tink/javadoc/apps-paymentmethodtoken/1.4.0-rc2).
The Maven group ID is `com.google.crypto.tink`, and the artifact ID is
`apps-paymentmethodtoken`.
@@ -16,7 +16,7 @@
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>apps-paymentmethodtoken</artifactId>
- <version>1.4.0-rc1</version>
+ <version>1.4.0-rc2</version>
</dependency>
```
diff --git a/apps/rewardedads/README.md b/apps/rewardedads/README.md
index 8438874..d3b5a98 100644
--- a/apps/rewardedads/README.md
+++ b/apps/rewardedads/README.md
@@ -6,9 +6,9 @@
## Latest Release
The most recent release is
-[1.4.0-rc1](https://github.com/google/tink/releases/tag/v1.4.0-rc1), released
-2020-04-30. API docs can be found
-[here](https://google.github.com/tink/javadoc/apps-rewardedads/1.4.0-rc1).
+[1.4.0-rc2](https://github.com/google/tink/releases/tag/v1.4.0-rc2), released
+2020-05-14. API docs can be found
+[here](https://google.github.com/tink/javadoc/apps-rewardedads/1.4.0-rc2).
The Maven group ID is `com.google.crypto.tink`, and the artifact ID is
`apps-rewardedads`.
@@ -19,7 +19,7 @@
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>apps-rewardedads</artifactId>
- <version>1.4.0-rc1</version>
+ <version>1.4.0-rc2</version>
</dependency>
```
diff --git a/apps/webpush/README.md b/apps/webpush/README.md
index e20c826..39abdb3 100644
--- a/apps/webpush/README.md
+++ b/apps/webpush/README.md
@@ -11,7 +11,7 @@
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>apps-webpush</artifactId>
- <version>1.4.0-rc1</version>
+ <version>1.4.0-rc2</version>
</dependency>
```
@@ -19,7 +19,7 @@
```
dependencies {
- compile 'com.google.crypto.tink:apps-webpush:1.4.0-rc1'
+ implementation 'com.google.crypto.tink:apps-webpush:1.4.0-rc2'
}
```
diff --git a/cc/version_script.lds b/cc/version_script.lds
index 7fed84a..0f1e264 100644
--- a/cc/version_script.lds
+++ b/cc/version_script.lds
@@ -1,4 +1,4 @@
-VERS_1.4.0-rc1 {
+VERS_1.4.0-rc2 {
global:
*tink*;
*absl*;
diff --git a/docs/JAVA-HOWTO.md b/docs/JAVA-HOWTO.md
index d464a00..dbc71d1 100644
--- a/docs/JAVA-HOWTO.md
+++ b/docs/JAVA-HOWTO.md
@@ -9,8 +9,8 @@
## Setup instructions
The most recent release is
-[1.4.0-rc1](https://github.com/google/tink/releases/tag/v1.4.0-rc1), released
-2020-03-11.
+[1.4.0-rc2](https://github.com/google/tink/releases/tag/v1.4.0-rc2), released
+2020-05-14.
In addition to the versioned releases, snapshots of Tink are regurlarly built
using the master branch of the Tink GitHub repository.
@@ -35,7 +35,7 @@
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>tink</artifactId>
- <version>1.4.0-rc1</version>
+ <version>1.4.0-rc2</version>
</dependency>
</dependencies>
```
@@ -72,7 +72,7 @@
### AWS/GCP integration
-Since 1.3.0-rc1 the support for AWS/GCP KMS has been moved to a separate
+Since 1.3.0-rc2 the support for AWS/GCP KMS has been moved to a separate
package. To use AWS KMS, one should also add dependency on `tink-awskms`, and
similarly `tink-gcpkms` for GCP KMS.
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>tink-awskms</artifactId>
- <version>1.4.0-rc1</version>
+ <version>1.4.0-rc2</version>
</dependency>
</dependencies>
```
@@ -91,7 +91,7 @@
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>tink-gcpkms</artifactId>
- <version>1.4.0-rc1</version>
+ <version>1.4.0-rc2</version>
</dependency>
</dependencies>
```
@@ -105,7 +105,7 @@
```
dependencies {
- compile 'com.google.crypto.tink:tink-android:1.4.0-rc1'
+ implementation 'com.google.crypto.tink:tink-android:1.4.0-rc2'
}
```
@@ -118,17 +118,17 @@
}
dependencies {
- compile 'com.google.crypto.tink:tink-android:HEAD-SNAPSHOT'
+ implementation 'com.google.crypto.tink:tink-android:HEAD-SNAPSHOT'
}
```
## API documentation
* Java:
- * [1.4.0-rc1](https://google.github.com/tink/javadoc/tink/1.4.0-rc1)
+ * [1.4.0-rc2](https://google.github.com/tink/javadoc/tink/1.4.0-rc2)
* [HEAD-SNAPSHOT](https://google.github.com/tink/javadoc/tink/HEAD-SNAPSHOT)
* Android:
- * [1.4.0-rc1](https://google.github.com/tink/javadoc/tink-android/1.4.0-rc1)
+ * [1.4.0-rc2](https://google.github.com/tink/javadoc/tink-android/1.4.0-rc2)
* [HEAD-SNAPSHOT](https://google.github.com/tink/javadoc/tink-android/HEAD-SNAPSHOT)
## Important warnings
diff --git a/go/integration/hcvault/go.mod b/go/integration/hcvault/go.mod
index b0d4eea..6ae0e01 100644
--- a/go/integration/hcvault/go.mod
+++ b/go/integration/hcvault/go.mod
@@ -3,6 +3,6 @@
go 1.12
require (
- github.com/google/tink/go v1.4.0-rc1
+ github.com/google/tink/go v1.4.0-rc2
github.com/hashicorp/vault/api v1.0.4
)
diff --git a/objc/CHANGELOG b/objc/CHANGELOG
index 18a5d28..90b8fcb 100644
--- a/objc/CHANGELOG
+++ b/objc/CHANGELOG
@@ -1,3 +1,7 @@
+Version 1.4.0-rc2
+==================================
+No changes to the Obj-C implementation since 1.4.0-rc1.
+
Version 1.4.0-rc1
==================================
No changes to the Obj-C implementation since 1.3.0.
diff --git a/python/VERSION b/python/VERSION
index 0249151..092c7ac 100644
--- a/python/VERSION
+++ b/python/VERSION
@@ -1,2 +1,2 @@
""" Version of the current release of Tink """
-TINK_VERSION_LABEL = "1.4.0-rc1"
+TINK_VERSION_LABEL = "1.4.0-rc2"
diff --git a/tink_version.bzl b/tink_version.bzl
index 0249151..092c7ac 100644
--- a/tink_version.bzl
+++ b/tink_version.bzl
@@ -1,2 +1,2 @@
""" Version of the current release of Tink """
-TINK_VERSION_LABEL = "1.4.0-rc1"
+TINK_VERSION_LABEL = "1.4.0-rc2"
diff --git a/tink_version.cmake b/tink_version.cmake
index e1455f0..b50e850 100644
--- a/tink_version.cmake
+++ b/tink_version.cmake
@@ -1,2 +1,2 @@
# Version of the current release of Tink.
-set(TINK_VERSION_LABEL 1.4.0-rc1)
+set(TINK_VERSION_LABEL 1.4.0-rc2)
