From 3f548bcb5215a72a739fa9c7054631092f3b5cd3 Mon Sep 17 00:00:00 2001 From: Bruno Bowden Date: Sun, 25 Oct 2020 16:04:28 -0700 Subject: [PATCH] simple_connectivity v0.0.1 => connectivity v2.0.0 - Closes #1532 - Replace 3rd party simple_connectivity with Google connectivity package - New version removes dependency on locations permission: - compileSdkVersion 29 - matching targetSdk and Flutter packages - Java 11 for CI environment to fix build failure where `Werror` flag in connectivity causes `source value 7 is obsolete` warning to fail build. --- .github/workflows/client.yaml | 2 +- client/android/app/build.gradle | 2 +- client/ios/Podfile.lock | 14 ++++----- client/ios/Runner.xcodeproj/project.pbxproj | 4 +-- client/lib/api/content/caching.dart | 2 +- client/lib/api/updateable.dart | 2 +- client/pubspec.lock | 35 ++++++++++++++++----- client/pubspec.yaml | 5 +-- 8 files changed, 42 insertions(+), 24 deletions(-) diff --git a/.github/workflows/client.yaml b/.github/workflows/client.yaml index fdc460d46a..cae2e3a8b6 100644 --- a/.github/workflows/client.yaml +++ b/.github/workflows/client.yaml @@ -83,7 +83,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "11.0.9" - run: git clone https://github.com/flutter/flutter.git --depth 1 -b $FLUTTER_VERSION _flutter - run: echo "::add-path::$GITHUB_WORKSPACE/_flutter/bin" - run: flutter pub get diff --git a/client/android/app/build.gradle b/client/android/app/build.gradle index 825597d8ce..df6e110f36 100644 --- a/client/android/app/build.gradle +++ b/client/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' android { - compileSdkVersion 28 + compileSdkVersion 29 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index 8651e9c421..928c05d248 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -1,4 +1,7 @@ PODS: + - connectivity (0.0.1): + - Flutter + - Reachability - Firebase/Analytics (6.26.0): - Firebase/Core - Firebase/Core (6.26.0): @@ -128,9 +131,6 @@ PODS: - Flutter - shared_preferences (0.0.1): - Flutter - - simple_connectivity (0.0.1): - - Flutter - - Reachability - sqflite (0.0.1): - Flutter - FMDB (~> 2.7.2) @@ -138,6 +138,7 @@ PODS: - Flutter DEPENDENCIES: + - connectivity (from `.symlinks/plugins/connectivity/ios`) - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`) @@ -148,7 +149,6 @@ DEPENDENCIES: - path_provider (from `.symlinks/plugins/path_provider/ios`) - share (from `.symlinks/plugins/share/ios`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - - simple_connectivity (from `.symlinks/plugins/simple_connectivity/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) @@ -175,6 +175,8 @@ SPEC REPOS: - Reachability EXTERNAL SOURCES: + connectivity: + :path: ".symlinks/plugins/connectivity/ios" firebase_analytics: :path: ".symlinks/plugins/firebase_analytics/ios" firebase_core: @@ -195,14 +197,13 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/share/ios" shared_preferences: :path: ".symlinks/plugins/shared_preferences/ios" - simple_connectivity: - :path: ".symlinks/plugins/simple_connectivity/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" SPEC CHECKSUMS: + connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467 Firebase: 7cf5f9c67f03cb3b606d1d6535286e1080e57eb6 firebase_analytics: 31b66f23a42fa62bdf6a134af1d3a3a50bf5ac3e firebase_core: 00e54a4744164a6b5a250b96dd1ad5afaba7a342 @@ -232,7 +233,6 @@ SPEC CHECKSUMS: Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 share: bae0a282aab4483288913fc4dc0b935d4b491f2e shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - simple_connectivity: 84a7221f5ca3d54ebf18faa4d74f0bb6cc757cbe sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef diff --git a/client/ios/Runner.xcodeproj/project.pbxproj b/client/ios/Runner.xcodeproj/project.pbxproj index ef73347c65..2c4c88817b 100644 --- a/client/ios/Runner.xcodeproj/project.pbxproj +++ b/client/ios/Runner.xcodeproj/project.pbxproj @@ -225,13 +225,13 @@ "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework", + "${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", "${BUILT_PRODUCTS_DIR}/notification_permissions/notification_permissions.framework", "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework", "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", "${BUILT_PRODUCTS_DIR}/share/share.framework", "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", - "${BUILT_PRODUCTS_DIR}/simple_connectivity/simple_connectivity.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", ); @@ -243,13 +243,13 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/notification_permissions.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/simple_connectivity.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", ); diff --git a/client/lib/api/content/caching.dart b/client/lib/api/content/caching.dart index 2cdf2b56b6..f1847ed97d 100644 --- a/client/lib/api/content/caching.dart +++ b/client/lib/api/content/caching.dart @@ -1,5 +1,5 @@ import 'dart:io'; -import 'package:simple_connectivity/simple_connectivity.dart'; +import 'package:connectivity/connectivity.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:path_provider/path_provider.dart'; import 'package:path/path.dart' as paths; diff --git a/client/lib/api/updateable.dart b/client/lib/api/updateable.dart index ba4cdfc732..70f0f1484b 100644 --- a/client/lib/api/updateable.dart +++ b/client/lib/api/updateable.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:simple_connectivity/simple_connectivity.dart'; +import 'package:connectivity/connectivity.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/client/pubspec.lock b/client/pubspec.lock index 3e86d101ea..8e71f952f7 100644 --- a/client/pubspec.lock +++ b/client/pubspec.lock @@ -148,6 +148,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.15.0-nullsafety.3" + connectivity: + dependency: "direct main" + description: + name: connectivity + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" + connectivity_for_web: + dependency: transitive + description: + name: connectivity_for_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.1+2" + connectivity_macos: + dependency: transitive + description: + name: connectivity_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.0+5" + connectivity_platform_interface: + dependency: transitive + description: + name: connectivity_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.6" convert: dependency: transitive description: @@ -714,13 +742,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.2.3" - simple_connectivity: - dependency: "direct main" - description: - name: simple_connectivity - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.1" sky_engine: dependency: transitive description: flutter diff --git a/client/pubspec.yaml b/client/pubspec.yaml index 06cd12617f..2824715f11 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -26,10 +26,7 @@ dependencies: sdk: flutter auto_size_text: 2.1.0 - simple_connectivity: 0.1.1 - # TODO: Replace with connectivity plugin: - # connectivity: ^2.0.0 - # https://github.com/WorldHealthOrganization/app/issues/1532 + connectivity: ^2.0.0 cupertino_icons: ^0.1.3 expressions: 0.1.5 firebase_analytics: ^6.0.0