Merge branch 'release-v2.5.0'

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.5.0 (unreleased)
+## 2.5.0 (2020-02-04)
 
 ### New features
  * `SafeCast.toUintXX`: new library for integer downcasting, which allows for safe operation on smaller types (e.g. `uint32`) when combined with `SafeMath`. ([#1926](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1926))

contracts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/contracts",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Secure Smart Contract library for Solidity",
   "files": [
     "**/*.sol",
@@ -28,5 +28,5 @@
   "bugs": {
     "url": "https://github.com/OpenZeppelin/openzeppelin-contracts/issues"
   },
-  "homepage": "https://github.com/OpenZeppelin/openzeppelin-contracts"
+  "homepage": "https://openzeppelin.com/contracts/"
 }

contracts/utils/EnumerableSet.sol

@@ -13,8 +13,7 @@ pragma solidity ^0.5.0;
  *
  * As of v2.5.0, only `address` sets are supported.
  *
- * Include with `using EnumerableSet for EnumerableSet.AddressSet;`, and use
- * {newAddressSet} to create a new `AddressSet`.
+ * Include with `using EnumerableSet for EnumerableSet.AddressSet;`.
  *
  * _Available since v2.5.0._
  *
@@ -112,8 +111,6 @@ library EnumerableSet {
 
     /**
      * @dev Returns the number of elements on the set. O(1).
-     * Note that there are no guarantees on the ordering of values inside the
-     * array, and it may change when more values are added or removed.
      */
     function length(AddressSet storage set)
         internal
@@ -128,8 +125,8 @@ library EnumerableSet {
     * array, and it may change when more values are added or removed.
     *
     * Requirements:
-     *
-     * - `index` must be strictly less than {length}.
+    *
+    * - `index` must be strictly less than {length}.
     */
     function get(AddressSet storage set, uint256 index)
         internal

ethpm.json

@@ -1,6 +1,6 @@
 {
   "package_name": "zeppelin",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Secure Smart Contract library for Solidity",
   "authors": [
     "OpenZeppelin Community <maintainers@openzeppelin.org>"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "openzeppelin-solidity",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzeppelin-solidity",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Secure Smart Contract library for Solidity",
   "files": [
     "/contracts/**/*.sol",
@@ -42,7 +42,7 @@
   "bugs": {
     "url": "https://github.com/OpenZeppelin/openzeppelin-contracts/issues"
   },
-  "homepage": "https://github.com/OpenZeppelin/openzeppelin-contracts",
+  "homepage": "https://openzeppelin.com/contracts/",
   "devDependencies": {
     "@openzeppelin/cli": "^2.5.3",
     "@openzeppelin/gsn-helpers": "^0.2.3",