diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index ad2d57fb..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Release Apk - -on: - push: - branches: - - main - -jobs: - build: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 - with: - java-version: '12.x' - - - uses: subosito/flutter-action@v1 - with: - channel: 'stable' - flutter-version: '2.5.3' - - - run: flutter pub get - - - run: wget "${{secrets.KEY_FILE_URL}}" > android/app/fjy.androidstudio.key - - - run: wget "${{secrets.KEY_PROP_URL}}" > android/key.properties - - - run: ./make.dart build android - - - run: echo "APP_VER=$(git log --oneline | wc -l | xargs)" >> $GITHUB_ENV - - - uses: actions/upload-artifact@v1 - with: - name: Release Apk - path: release/Toolbox_${{ env.APP_VER }}_Arm64.apk diff --git a/README.md b/README.md index a266a23a..abf46ba5 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,19 @@ A new Flutter project which provide a chart view to display server status data. - [x] Server Status Detail Page - [x] Theme Switch - [ ] Execute Snippet +- [ ] Migrate from `ssh2` to `dartssh2` + +## Build +Please use `make.dart` to build. +```shell +# build android apk +./make.dart build android +# due to pub package 'ssh2' incompatibility +# can't build ios ipa through './make.dart build ios' +# more info: [https://github.com/jda258/flutter_ssh2/issues/8] +# please run below cmd to run on ios device +./make.dart run release +``` ## License `LGPL License. LollipopKit 2021` diff --git a/lib/core/analysis.dart b/lib/core/analysis.dart index cac7d1f6..ee922d71 100644 --- a/lib/core/analysis.dart +++ b/lib/core/analysis.dart @@ -6,14 +6,7 @@ class Analysis { static const _url = 'https://countly.xuty.cc'; static const _key = '80372a2a66424b32d0ac8991bfa1ef058bd36b1f'; - static bool _enabled = false; - static Future init(bool debug) async { - if (_url.isEmpty || _key.isEmpty) { - return; - } - - _enabled = true; await Countly.setLoggingEnabled(debug); await Countly.init(_url, _key); await Countly.start(); @@ -22,12 +15,10 @@ class Analysis { } static void recordView(String view) { - if (!_enabled) return; Countly.recordView(view); } static void recordException(Object exception, [bool fatal = false]) { - if (!_enabled) return; Countly.logException(exception.toString(), !fatal, null); } } diff --git a/pubspec.lock b/pubspec.lock index 9238e1c6..512923d6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -55,7 +55,7 @@ packages: description: path: "." ref: main - resolved-ref: f3e0088bb08c5d05473b1d568943f4f8732dd984 + resolved-ref: "36a46aaa41690aac96fa808a6e75841464007a3b" url: "https://github.com/LollipopKit/circle_chart" source: git version: "0.0.3" @@ -109,7 +109,7 @@ packages: name: extended_image url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "5.1.3" extended_image_library: dependency: transitive description: @@ -163,7 +163,7 @@ packages: name: flutter_native_splash url: "https://pub.dartlang.org" source: hosted - version: "1.2.4" + version: "1.3.1" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -292,7 +292,7 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" path_provider_linux: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 232ff5a3..c8ec248c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,7 +37,7 @@ dependencies: dio: ^4.0.0 after_layout: ^1.1.0 flutter_staggered_animations: ^1.0.0 - extended_image: ^4.0.0 + extended_image: ^5.1.3 url_launcher: ^6.0.9 countly_flutter: git: