diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 774a5ae..0b84945 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,10 @@ version: 2 enable-beta-ecosystems: true updates: + - package-ecosystem: "pub" + directory: "." + schedule: + interval: "monthly" - package-ecosystem: "pub" directory: "web_socket" schedule: diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 0000000..113b16d --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,10 @@ +name: _ +publish_to: none +environment: + sdk: ^3.6.0 +workspace: + - web_socket + - web_socket_browser + - web_socket_io + - web_socket_support + - web_socket_test diff --git a/tool/run_all.sh b/tool/run_all.sh deleted file mode 100755 index 9700c56..0000000 --- a/tool/run_all.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set +xe - -export PKG="web_socket_io" -./tool/travis.sh dartfmt dartanalyzer test_vm -export PKG="web_socket" -./tool/travis.sh dartfmt dartanalyzer test_vm diff --git a/tool/travis.sh b/tool/travis.sh deleted file mode 100755 index f4a6d63..0000000 --- a/tool/travis.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -cd web_socket_support -pub get -dart tool/travis.dart \ No newline at end of file diff --git a/tool/travis_old.sh b/tool/travis_old.sh deleted file mode 100755 index 8947eee..0000000 --- a/tool/travis_old.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -if [ -z "$PKG" ]; then - echo -e '\033[31mPKG environment variable must be set!\033[0m' - exit 1 -fi - -if [ "$#" == "0" ]; then - echo -e '\033[31mAt least one task argument must be provided!\033[0m' - exit 1 -fi - -pushd $PKG -pub get || exit $? - -EXIT_CODE=0 - -while (( "$#" )); do - TASK=$1 - case $TASK in - dartanalyzer) echo - echo -e '\033[1mTASK: dartanalyzer\033[22m' - echo -e 'dartanalyzer --fatal-infos --fatal-warnings .' - dartanalyzer --fatal-infos --fatal-warnings . || EXIT_CODE=$? - ;; - dartfmt) echo - echo -e '\033[1mTASK: dartfmt\033[22m' - echo -e 'dartfmt -n --set-exit-if-changed .' - dartfmt -n --set-exit-if-changed . || EXIT_CODE=$? - ;; - test_vm) echo - echo -e '\033[1mTASK: test_vm\033[22m' - echo -e 'pub run test' - pub run test || EXIT_CODE=$? - ;; - *) echo -e "\033[31mNot expecting TASK '${TASK}'. Error!\033[0m" - EXIT_CODE=1 - ;; - esac - - shift -done - -exit $EXIT_CODE \ No newline at end of file diff --git a/web_socket/pubspec.yaml b/web_socket/pubspec.yaml index c761faa..28768b3 100644 --- a/web_socket/pubspec.yaml +++ b/web_socket/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none #author: alex environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: http: any @@ -19,6 +19,7 @@ dependencies: stream_channel: '>=2.1.0-0' dev_dependencies: - test: '>=1.0.0' - dev_build: any - process_run: + test: ">=1.24.0" + dev_build: ">=1.1.0+2" + process_run: ">=1.2.1+1" +resolution: workspace diff --git a/web_socket_browser/pubspec.yaml b/web_socket_browser/pubspec.yaml index f976021..811789f 100644 --- a/web_socket_browser/pubspec.yaml +++ b/web_socket_browser/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none #author: alex environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: tekartik_web_socket: @@ -17,10 +17,10 @@ dependencies: version: '>=0.2.2' web_socket_channel: dev_dependencies: - test: ">=1.0.0" - dev_build: any - build_web_compilers: '>=0.4.0' - process_run: + test: ">=1.24.0" + dev_build: ">=1.1.0+2" + build_web_compilers: ">=4.0.11" + process_run: ">=1.2.1+1" tekartik_web_socket_test: git: url: https://github.com/tekartik/web_socket.dart @@ -28,8 +28,4 @@ dev_dependencies: ref: dart3a version: '>=0.1.0' -dependency_overrides: - tekartik_web_socket: - path: ../web_socket - tekartik_web_socket_test: - path: ../web_socket_test +resolution: workspace diff --git a/web_socket_io/lib/src/web_socket_io.dart b/web_socket_io/lib/src/web_socket_io.dart index 3fa8f7e..e472385 100644 --- a/web_socket_io/lib/src/web_socket_io.dart +++ b/web_socket_io/lib/src/web_socket_io.dart @@ -42,10 +42,9 @@ class _WebSocketChannelServerIo implements WebSocketChannelServer { } Future serve() async { - var handler = - webSocketHandler((native.WebSocketChannel nativeWebSocketChannel) { - final webSocketChannel = - WebSocketChannelNative(nativeWebSocketChannel); + var handler = webSocketHandler( + (native.WebSocketChannel webSocket, String? subprotocol) { + final webSocketChannel = WebSocketChannelNative(webSocket); // add to our list for cleanup channels.add(webSocketChannel); diff --git a/web_socket_io/pubspec.yaml b/web_socket_io/pubspec.yaml index ab04f78..f8de2fe 100644 --- a/web_socket_io/pubspec.yaml +++ b/web_socket_io/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none #author: alex environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: tekartik_web_socket: @@ -19,19 +19,17 @@ dependencies: shelf_web_socket: '>=0.2.2' web_socket_channel: dev_dependencies: - test: ">=1.2.0" - dev_build: any - collection: '>=1.14.10' - path: '>=1.6.1' - process_run: '>=0.10.3' + test: ">=1.24.0" + dev_build: ">=1.1.0+2" + collection: ">=1.18.0" + path: ">=1.9.0" + process_run: ">=1.2.1+1" tekartik_web_socket_test: git: url: https://github.com/tekartik/web_socket.dart path: web_socket_test ref: dart3a version: '>=0.1.0' -dependency_overrides: - tekartik_web_socket: - path: ../web_socket - tekartik_web_socket_test: - path: ../web_socket_test + + +resolution: workspace diff --git a/web_socket_support/pubspec.yaml b/web_socket_support/pubspec.yaml index 6ad8983..5f62701 100644 --- a/web_socket_support/pubspec.yaml +++ b/web_socket_support/pubspec.yaml @@ -6,17 +6,18 @@ publish_to: none # environment: - sdk: ^3.5.0 + sdk: ^3.6.0 #dependencies: # path: ^1.6.0 dev_dependencies: - dev_build: - test: ^1.6.0 + dev_build: ">=1.1.0+2" + test: ">=1.24.0" tekartik_common_utils: git: url: https://github.com/tekartik/common_utils.dart ref: dart3a - process_run: - path: + process_run: ">=1.2.1+1" + path: ">=1.9.0" +resolution: workspace diff --git a/web_socket_test/pubspec.yaml b/web_socket_test/pubspec.yaml index e5e8ec1..817e04e 100644 --- a/web_socket_test/pubspec.yaml +++ b/web_socket_test/pubspec.yaml @@ -6,7 +6,7 @@ publish_to: none #author: alex environment: - sdk: ^3.5.0 + sdk: ^3.6.0 dependencies: tekartik_web_socket: @@ -15,13 +15,11 @@ dependencies: path: web_socket ref: dart3a version: '>=0.2.2' - process_run: - test: + process_run: ">=1.2.1+1" + test: ">=1.24.0" dev_dependencies: - dev_build: any - collection: '>=1.14.10' + dev_build: ">=1.1.0+2" + collection: ">=1.18.0" -dependency_overrides: - tekartik_web_socket: - path: ../web_socket +resolution: workspace