Skip to content

Commit

Permalink
Merge pull request #18 from Apollon77/master
Browse files Browse the repository at this point in the history
Core Files/Testing Update and introduce adapter-core
  • Loading branch information
rgwch authored Mar 7, 2019
2 parents 70cde7d + 4e0f970 commit 0fadfd2
Show file tree
Hide file tree
Showing 7 changed files with 834 additions and 805 deletions.
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
os:
- linux
- osx
- windows
language: node_js
node_js:
- '4'
- '6'
- '8'
- '10'
before_script:
- npm install [email protected]
- export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1)
- 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm@5; fi'
- npm -v
- npm install [email protected]
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
env:
- CXX=g++-4.8
- CXX=g++-4.9
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- g++-4.9
7 changes: 5 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
version: 'test-{build}'
environment:
matrix:
- nodejs_version: '4'
- nodejs_version: '6'
- nodejs_version: '8'
- nodejs_version: '10'
platform:
- x86
- x64
clone_folder: 'c:\projects\%APPVEYOR_PROJECT_NAME%'
install:
- ps: 'Install-Product node $env:nodejs_version $env:platform'
- ps: '$NpmVersion = (npm -v).Substring(0,1)'
- ps: 'if($NpmVersion -eq 5) { npm install -g npm@5 }'
- ps: npm --version
- npm install
- npm install winston@2.3.0
- npm install winston@3.2.1
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
test_script:
- echo %cd%
Expand Down
83 changes: 0 additions & 83 deletions lib/utils.js

This file was deleted.

2 changes: 1 addition & 1 deletion mystrom-wifi-switch.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var lastValue = 0;


// you have to require the utils module and call adapter function
var utils = require(__dirname + '/lib/utils'); // Get common adapter utils
var utils = require('@iobroker/adapter-core'); // Get common adapter utils

// you have to call the adapter function and pass a options object
// name has to be set and has to be equal to adapters folder name and main file name excluding extension
Expand Down
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,24 @@
"url": "https://github.com/rgwch/ioBroker.mystrom-wifi-switch"
},
"dependencies": {
"request": "^2.81.0"
"request": "^2.81.0",
"@iobroker/adapter-core": "^1.0.3"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-replace": "^0.9.3",
"grunt-contrib-jshint": "^0.11.2",
"grunt-jscs": "^2.0.0",
"grunt-http": "^1.6.0",
"mocha": "^2.3.4",
"chai": "^3.4.1"
"grunt": "^1.0.1",
"grunt-replace": "^1.0.1",
"grunt-contrib-jshint": "^1.1.0",
"grunt-jscs": "^3.0.1",
"grunt-http": "^2.2.0",
"mocha": "^6.0.2",
"chai": "^4.2.0"
},
"main": "mystrom-wifi-switch.js",
"scripts": {
"test": "node node_modules/mocha/bin/mocha"
"test": "node node_modules/mocha/bin/mocha --exit"
},
"bugs": {
"url": "https://github.com/rgwch/ioBroker.mystrom-wifi-switch/issues"
},
"readmeFilename": "README.md"
}
}
Loading

0 comments on commit 0fadfd2

Please sign in to comment.