From 0807f43b8c52a76f7cd07b799a1149585c1c5a2b Mon Sep 17 00:00:00 2001 From: Uzir Date: Sun, 11 Jul 2021 18:01:59 -0500 Subject: [PATCH 1/2] updated package --- bin/unzip_zoom_sdk.dart | 9 +- example/pubspec.lock | 92 ++++++-------- lib/zoom_options.dart | 69 +++++----- lib/zoom_view.dart | 22 ++-- pubspec.lock | 273 ++++++++++++++++++++++++++++++++++------ pubspec.yaml | 7 +- 6 files changed, 329 insertions(+), 143 deletions(-) diff --git a/bin/unzip_zoom_sdk.dart b/bin/unzip_zoom_sdk.dart index 7c5aa1e..4dcd2f2 100644 --- a/bin/unzip_zoom_sdk.dart +++ b/bin/unzip_zoom_sdk.dart @@ -4,10 +4,13 @@ import 'package:archive/archive.dart'; import 'package:args/args.dart'; void main(List args) { + var location = Platform.script + .toString() + .replaceFirst("file://", "") + .replaceFirst("/bin/unzip_zoom_sdk.dart", ""); - var location = Platform.script.toString().replaceFirst("file://", "").replaceFirst("/bin/unzip_zoom_sdk.dart", ""); - - var filename = location + '/ios-sdk/MobileRTC${(args.length == 0) ? "" : "-dev"}.zip'; + var filename = + location + '/ios-sdk/MobileRTC${(args.length == 0) ? "" : "-dev"}.zip'; print('Decompressing ' + filename); diff --git a/example/pubspec.lock b/example/pubspec.lock index 87689d7..55d0f3d 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,56 +7,63 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "2.0.13" + version: "3.1.2" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.6.0" + version: "2.1.1" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.1" + version: "2.5.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" - collection: + version: "1.2.0" + clock: dependency: transitive description: - name: collection + name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.14.12" - convert: + version: "1.1.0" + collection: dependency: transitive description: - name: convert + name: collection url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "1.15.0" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "3.0.1" cupertino_icons: dependency: "direct main" description: @@ -64,6 +71,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -81,48 +95,27 @@ packages: relative: true source: path version: "0.0.7" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.12" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.6" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.3" + version: "1.8.0" sky_engine: dependency: transitive description: flutter @@ -134,63 +127,56 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.19" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.6.1" + version: "2.1.0" sdks: - dart: ">=2.6.0 <3.0.0" - flutter: ">=1.12.0 <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.12.0" diff --git a/lib/zoom_options.dart b/lib/zoom_options.dart index 438829c..898d00e 100644 --- a/lib/zoom_options.dart +++ b/lib/zoom_options.dart @@ -1,46 +1,37 @@ - class ZoomOptions { + String? domain; + String? appKey; + String? appSecret; + String? jwtToken; - String domain; - String appKey; - String appSecret; - String jwtToken; - - ZoomOptions({ - this.domain, - this.appKey, - this.appSecret, - this.jwtToken - }); + ZoomOptions({this.domain, this.appKey, this.appSecret, this.jwtToken}); } class ZoomMeetingOptions { + String? userId; + String? displayName; + String? meetingId; + String? meetingPassword; + String? zoomToken; + String? zoomAccessToken; + String? disableDialIn; + String? disableDrive; + String? disableInvite; + String? disableShare; + String? noDisconnectAudio; + String? noAudio; - String userId; - String displayName; - String meetingId; - String meetingPassword; - String zoomToken; - String zoomAccessToken; - String disableDialIn; - String disableDrive; - String disableInvite; - String disableShare; - String noDisconnectAudio; - String noAudio; - - ZoomMeetingOptions({ - this.userId, - this.displayName, - this.meetingId, - this.meetingPassword, - this.zoomToken, - this.zoomAccessToken, - this.disableDialIn, - this.disableDrive, - this.disableInvite, - this.disableShare, - this.noDisconnectAudio, - this.noAudio - }); + ZoomMeetingOptions( + {this.userId, + this.displayName, + this.meetingId, + this.meetingPassword, + this.zoomToken, + this.zoomAccessToken, + this.disableDialIn, + this.disableDrive, + this.disableInvite, + this.disableShare, + this.noDisconnectAudio, + this.noAudio}); } diff --git a/lib/zoom_view.dart b/lib/zoom_view.dart index 3b6dbb1..7ef63a0 100644 --- a/lib/zoom_view.dart +++ b/lib/zoom_view.dart @@ -9,10 +9,10 @@ typedef void ZoomViewCreatedCallback(ZoomViewController controller); class ZoomView extends StatefulWidget { const ZoomView({ - Key key, - this.zoomOptions, - this.meetingOptions, - this.onViewCreated, + Key? key, + required this.zoomOptions, + required this.meetingOptions, + required this.onViewCreated, }) : super(key: key); final ZoomViewCreatedCallback onViewCreated; @@ -62,10 +62,10 @@ class ZoomViewController { final MethodChannel _methodChannel; final EventChannel _zoomStatusEventChannel; - Future initZoom(ZoomOptions options) async { + Future initZoom(ZoomOptions options) async { assert(options != null); - var optionMap = new Map(); + var optionMap = new Map(); optionMap.putIfAbsent("appKey", () => options.appKey); optionMap.putIfAbsent("appSecret", () => options.appSecret); optionMap.putIfAbsent("domain", () => options.domain); @@ -73,9 +73,9 @@ class ZoomViewController { return _methodChannel.invokeMethod('init', optionMap); } - Future startMeeting(ZoomMeetingOptions options) async { + Future startMeeting(ZoomMeetingOptions options) async { assert(options != null); - var optionMap = new Map(); + var optionMap = new Map(); optionMap.putIfAbsent("userId", () => options.userId); optionMap.putIfAbsent("displayName", () => options.displayName); optionMap.putIfAbsent("meetingId", () => options.meetingId); @@ -92,9 +92,9 @@ class ZoomViewController { return _methodChannel.invokeMethod('start', optionMap); } - Future joinMeeting(ZoomMeetingOptions options) async { + Future joinMeeting(ZoomMeetingOptions options) async { assert(options != null); - var optionMap = new Map(); + var optionMap = new Map(); optionMap.putIfAbsent("userId", () => options.userId); optionMap.putIfAbsent("meetingId", () => options.meetingId); optionMap.putIfAbsent("meetingPassword", () => options.meetingPassword); @@ -108,7 +108,7 @@ class ZoomViewController { return _methodChannel.invokeMethod('join', optionMap); } - Future meetingStatus(String meetingId) async { + Future meetingStatus(String meetingId) async { assert(meetingId != null); var optionMap = new Map(); diff --git a/pubspec.lock b/pubspec.lock index 43d2389..d13c4db 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,62 +1,118 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "22.0.0" + analyzer: dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.1" + archive: + dependency: "direct main" description: name: archive url: "https://pub.dartlang.org" source: hosted - version: "2.0.13" + version: "3.1.2" args: - dependency: transitive + dependency: "direct main" description: name: args url: "https://pub.dartlang.org" source: hosted - version: "1.6.0" + version: "2.1.1" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.1" + version: "2.5.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.2.0" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.3" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.12" + version: "1.15.0" convert: dependency: transitive description: name: convert url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.1" + coverage: + dependency: transitive + description: + name: coverage + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "3.0.1" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.2" flutter: dependency: "direct main" description: flutter @@ -67,116 +123,263 @@ packages: description: flutter source: sdk version: "0.0.0" - image: + glob: dependency: transitive description: - name: image + name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.1.12" + version: "2.0.1" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.0" + io: + dependency: transitive + description: + name: io + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" + logging: + dependency: transitive + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.6" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0" + mime: + dependency: transitive + description: + name: mime + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + node_preamble: + dependency: transitive + description: + name: node_preamble + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.13" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - petitparser: + version: "1.8.0" + pedantic: dependency: transitive description: - name: petitparser + name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" - quiver: + version: "1.11.1" + pool: + dependency: transitive + description: + name: pool + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.0" + pub_semver: + dependency: transitive + description: + name: pub_semver + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + shelf: dependency: transitive description: - name: quiver + name: shelf url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "1.2.0" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.0" + shelf_static: + dependency: transitive + description: + name: shelf_static + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + source_maps: + dependency: transitive + description: + name: source_maps + url: "https://pub.dartlang.org" + source: hosted + version: "0.10.10" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" + test: + dependency: "direct dev" + description: + name: test + url: "https://pub.dartlang.org" + source: hosted + version: "1.16.5" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.19" + test_core: + dependency: transitive + description: + name: test_core + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.15" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" - xml: + version: "2.1.0" + vm_service: + dependency: transitive + description: + name: vm_service + url: "https://pub.dartlang.org" + source: hosted + version: "6.2.0" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + yaml: dependency: transitive description: - name: xml + name: yaml url: "https://pub.dartlang.org" source: hosted - version: "3.6.1" + version: "3.1.0" sdks: - dart: ">=2.6.0 <3.0.0" - flutter: ">=1.12.0 <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.12.0" diff --git a/pubspec.yaml b/pubspec.yaml index feb5c42..abf409e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,16 +4,19 @@ version: 0.0.7 homepage: https://decodedhealth.com issue_tracker: https://github.com/decodedhealth/flutter_zoom_plugin/issues environment: - sdk: ">=2.1.0 <3.0.0" - flutter: ">=1.12.0 <2.0.0" + sdk: '>=2.12.0 <3.0.0' + flutter: '>=1.12.0 <2.0.0' dependencies: flutter: sdk: flutter + archive: ^3.1.2 + args: ^2.1.1 dev_dependencies: flutter_test: sdk: flutter + test: ^1.16.5 # For information on the generic Dart part of this file, see the # following page: https://www.dartlang.org/tools/pub/pubspec From bbba4cfd57c5bb2bf218d95a3de6096a303de353 Mon Sep 17 00:00:00 2001 From: Akira Date: Sun, 25 Jul 2021 00:23:10 +0900 Subject: [PATCH 2/2] Create codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 71 +++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000..6d41d95 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,71 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ master ] + schedule: + - cron: '16 0 * * 6' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1