Skip to content
This repository has been archived by the owner on Apr 17, 2024. It is now read-only.

Commit

Permalink
Bump version to 1.4.0-rc2.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 311681131
  • Loading branch information
thaidn authored and copybara-github committed May 15, 2020
1 parent 1a04d49 commit 693d0e1
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 27 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ AEAD primitive in Java:
## 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.
Expand Down
8 changes: 4 additions & 4 deletions apps/paymentmethodtoken/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -16,7 +16,7 @@ To add a dependency using Maven:
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>apps-paymentmethodtoken</artifactId>
<version>1.4.0-rc1</version>
<version>1.4.0-rc2</version>
</dependency>
```

Expand Down
8 changes: 4 additions & 4 deletions apps/rewardedads/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ AdMob Rewarded Ads.
## 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`.
Expand All @@ -19,7 +19,7 @@ To add a dependency using Maven:
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>apps-rewardedads</artifactId>
<version>1.4.0-rc1</version>
<version>1.4.0-rc2</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions apps/webpush/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ To add a dependency using Maven:
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>apps-webpush</artifactId>
<version>1.4.0-rc1</version>
<version>1.4.0-rc2</version>
</dependency>
```

To add a dependency using Gradle:

```
dependencies {
compile 'com.google.crypto.tink:apps-webpush:1.4.0-rc1'
implementation 'com.google.crypto.tink:apps-webpush:1.4.0-rc2'
}
```

Expand Down
2 changes: 1 addition & 1 deletion cc/version_script.lds
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERS_1.4.0-rc1 {
VERS_1.4.0-rc2 {
global:
*tink*;
*absl*;
Expand Down
20 changes: 10 additions & 10 deletions docs/JAVA-HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ hacking guide](JAVA-HACKING.md).
## 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.
Expand All @@ -35,7 +35,7 @@ following configuration:
<dependency>
<groupId>com.google.crypto.tink</groupId>
<artifactId>tink</artifactId>
<version>1.4.0-rc1</version>
<version>1.4.0-rc2</version>
</dependency>
</dependencies>
```
Expand Down Expand Up @@ -72,7 +72,7 @@ You can specify the latest snapshot as a project dependency by using the version

### 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.

Expand All @@ -81,7 +81,7 @@ similarly `tink-gcpkms` for GCP KMS.
<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>
```
Expand All @@ -91,7 +91,7 @@ similarly `tink-gcpkms` for GCP KMS.
<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>
```
Expand All @@ -105,7 +105,7 @@ following configuration:

```
dependencies {
compile 'com.google.crypto.tink:tink-android:1.4.0-rc1'
implementation 'com.google.crypto.tink:tink-android:1.4.0-rc2'
}
```

Expand All @@ -118,17 +118,17 @@ repositories {
}
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
Expand Down
2 changes: 1 addition & 1 deletion go/integration/hcvault/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module github.com/google/tink/go/integration/hcvault
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
)
4 changes: 4 additions & 0 deletions objc/CHANGELOG
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion python/VERSION
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion tink_version.bzl
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion tink_version.cmake
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 693d0e1

Please sign in to comment.