Upgrading solidity, zeppelin and truffle

contracts/Migrations.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.21;
 
 contract Migrations {
   address public owner;

contracts/RegulatedToken.sol

@@ -1,7 +1,7 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.21;
 
-import 'zeppelin-solidity/contracts/token/DetailedERC20.sol';
-import 'zeppelin-solidity/contracts/token/MintableToken.sol';
+import 'zeppelin-solidity/contracts/token/ERC20/DetailedERC20.sol';
+import 'zeppelin-solidity/contracts/token/ERC20/MintableToken.sol';
 import './ServiceRegistry.sol';
 import './RegulatorService.sol';
 
@@ -85,9 +85,9 @@ contract RegulatedToken is DetailedERC20, MintableToken {
    * @return `true` if the check was successful and `false` if unsuccessful
    */
   function _check(address _from, address _to, uint256 _value) private returns (bool) {
-    var reason = _service().check(this, msg.sender, _from, _to, _value);
+    uint8 reason = _service().check(this, msg.sender, _from, _to, _value);
 
-    CheckStatus(reason, msg.sender, _from, _to, _value);
+    emit CheckStatus(reason, msg.sender, _from, _to, _value);
 
     return reason == 0;
   }

contracts/RegulatorService.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.21;
 
 /// @notice Standard interface for `RegulatorService`s
 contract RegulatorService {

contracts/ServiceRegistry.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.21;
 
 import './RegulatorService.sol';
 import 'zeppelin-solidity/contracts/ownership/Ownable.sol';
@@ -45,6 +45,6 @@ contract ServiceRegistry is Ownable {
   function replaceService(address _service) onlyOwner withContract(_service) public {
     address oldService = service;
     service = _service;
-    ReplaceService(oldService, service);
+    emit ReplaceService(oldService, service);
   }
 }

contracts/TokenRegulatorService.sol

@@ -1,7 +1,7 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.21;
 
 import 'zeppelin-solidity/contracts/ownership/Ownable.sol';
-import 'zeppelin-solidity/contracts/token/DetailedERC20.sol';
+import 'zeppelin-solidity/contracts/token/ERC20/DetailedERC20.sol';
 import './RegulatedToken.sol';
 import './RegulatorService.sol';
 
@@ -93,7 +93,7 @@ contract TokenRegulatorService is RegulatorService, Ownable {
   function setLocked(address _token, bool _locked) onlyOwner public {
     settings[_token].locked = _locked;
 
-    LogLockSet(_token, _locked);
+    emit LogLockSet(_token, _locked);
   }
 
   /**
@@ -106,7 +106,7 @@ contract TokenRegulatorService is RegulatorService, Ownable {
   function setPartialTransfers(address _token, bool _enabled) onlyOwner public {
    settings[_token].partialTransfers = _enabled;
 
-   LogPartialTransferSet(_token, _enabled);
+   emit LogPartialTransferSet(_token, _enabled);
   }
 
   /**
@@ -123,7 +123,7 @@ contract TokenRegulatorService is RegulatorService, Ownable {
   function setPermission(address _token, address _participant, uint8 _permission) onlyAdmins public {
     participants[_token][_participant] = _permission;
 
-    LogPermissionSet(_token, _participant, _permission);
+    emit LogPermissionSet(_token, _participant, _permission);
   }
 
   /**
@@ -137,7 +137,7 @@ contract TokenRegulatorService is RegulatorService, Ownable {
     address oldAdmin = admin;
     admin = newAdmin;
 
-    LogTransferAdmin(oldAdmin, newAdmin);
+    emit LogTransferAdmin(oldAdmin, newAdmin);
   }
 
   /**

package.json

@@ -7,13 +7,17 @@
     "test": "test"
   },
   "scripts": {
-    "test": "truffle test"
+    "compile": "node ./node_modules/truffle/build/cli.bundled.js compile",
+    "test": "node ./node_modules/truffle/build/cli.bundled.js test",
+    "test:single": "node ./node_modules/truffle/build/cli.bundled.js test test/helpers/MockRegulatedToken.sol test/helpers/MockRegulatorService.sol"
   },
   "author": "Bob Remeika",
   "license": "MIT",
-  "devDependencies": {},
+  "devDependencies": {
+    "truffle": "^4.1.5"
+  },
   "dependencies": {
     "bignumber.js": "^4.1.0",
-    "zeppelin-solidity": "^1.4.0"
+    "zeppelin-solidity": "^1.8.0"
   }
 }

test/helpers/MockRegulatedToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.21;
 
 import '../../contracts/RegulatedToken.sol';
 import '../../contracts/RegulatorService.sol';

test/helpers/MockRegulatorService.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.18;
+pragma solidity ^0.4.21;
 
 import '../../contracts/RegulatorService.sol';