Merge pull request #23 from Baseflow/develop

Stable null safety release

Author: mvanbeusekom

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: Baseflow
+custom: https://baseflow.com/contact

.github/workflows/google_api_availability.yaml

@@ -0,0 +1,56 @@
+# This is a basic workflow to help you get started with Actions
+
+name: google_api_availability
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the develop branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # Job configuration for the google_api_availability (App Facing Package)
+  google_api_availability:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+    env:
+      source-directory: ./ 
+      example-directory: ./example
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      
+      # Make sure the stable version of Flutter is available
+      - uses: subosito/flutter-action@v1
+        with:
+          channel: 'beta'
+
+      # Download all Flutter packages the google_api_availability depends on
+      - name: Download dependencies
+        run: flutter pub get
+        working-directory: ${{env.source-directory}}
+
+      # Run Flutter Format to ensure formatting is valid
+      - name: Run Flutter Format
+        run: flutter format --set-exit-if-changed lib
+        working-directory: ${{env.source-directory}}
+      
+      # Run Flutter Analyzer
+      - name: Run Flutter Analyzer
+        run: flutter analyze
+        working-directory: ${{env.source-directory}}
+      
+      # Build Android version of the example app
+      - name: Run Android build
+        run: flutter build apk --release
+        working-directory: ${{env.example-directory}}
+   
+      # Build iOS version of the example app
+      - name: Run iOS build
+        run: flutter build ios --release --no-codesign
+        working-directory: ${{env.example-directory}}

.travis.yml

@@ -1,3 +1,7 @@
+## 3.0.0
+
+* Stable null safety release.
+
 ## 2.0.4
 
 * Android: Depend on GMS base instead of location;

CHANGELOG.md

@@ -1,14 +1,9 @@
 # Flutter Google Api Availability Plugin  
 
-[![pub package](https://img.shields.io/pub/v/google_api_availability.svg)](https://pub.dartlang.org/packages/google_api_availability)
+[![pub package](https://img.shields.io/pub/v/google_api_availability.svg)](https://pub.dartlang.org/packages/google_api_availability) ![Build status](https://github.com/Baseflow/flutter-google-api-availability/workflows/google_api_availability/badge.svg?branch=master)
 
 A Flutter plugin to check the availability of Google Play services on the current device. 
 
-Branch  | Build Status 
-------- | ------------
-develop | [![Build Status](https://travis-ci.com/BaseflowIT/flutter-google-api-availability.svg?branch=develop)](https://travis-ci.com/BaseflowIT/flutter-google-api-availability)
-master  | [![Build Status](https://travis-ci.com/BaseflowIT/flutter-google-api-availability.svg?branch=master)](https://travis-ci.com/BaseflowIT/flutter-google-api-availability)
-
 ## Features
 
 * Check the availability of Google Play services (on Android only).
@@ -19,7 +14,7 @@ To use this plugin, add `google_api_availability` as a [dependency in your pubsp
 
 ```yaml
 dependencies:
-  google_api_availability: ^2.0.4
+  google_api_availability: ^3.0.0
 ```
 
 > **NOTE:** There's a known issue with integrating plugins that use Swift into a Flutter project created with the Objective-C template. See issue [Flutter#16049](https://github.com/flutter/flutter/issues/16049) for help on integration.
@@ -33,18 +28,18 @@ To check the availability of Google Play services on the current device, you can
 ``` dart
 import `package:google_api_availability/google_api_availability.dart`;
 
-GooglePlayServicesAvailability availability = await GoogleApiAvailability().checkGooglePlayServicesAvailability();
+GooglePlayServicesAvailability availability = await GoogleApiAvailability.instance.checkGooglePlayServicesAvailability();
 ```
 
 If you want to show a dialog by the Android system with more information and show a possible fix to the user you can do:
 
 ``` dart
 import `package:google_api_availability/google_api_availability.dart`;
 
-GooglePlayServicesAvailability availability = await GoogleApiAvailability().checkGooglePlayServicesAvailability(true);
+GooglePlayServicesAvailability availability = await GoogleApiAvailability.instance.checkGooglePlayServicesAvailability(true);
 ```
 
-**Note that on iOS this will always return false!**
+**Note that on iOS this will always return `notAvailableOnPlatform`!**
 
 See also the [example](example/lib/main.dart) project for a complete implementation.
 

README.md

@@ -1,9 +1,12 @@
-include: package:pedantic/analysis_options.1.8.0.yaml
+include: package:pedantic/analysis_options.yaml
+
 analyzer:
   exclude:
     # Ignore generated files
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
+    # workaround for https://github.com/dart-lang/sdk/issues/42910
+    - 'example/**'
 linter:
   rules:
     - public_member_api_docs

analysis_options.yaml

@@ -2,7 +2,6 @@
 
 import android.os.Bundle;
 import com.baseflow.googleapiavailability.GoogleApiAvailabilityPlugin;
-import dev.flutter.plugins.e2e.E2EPlugin;
 import io.flutter.app.FlutterActivity;
 
 public class EmbeddingV1Activity extends FlutterActivity {
@@ -13,6 +12,5 @@ protected void onCreate(Bundle savedInstanceState) {
     GoogleApiAvailabilityPlugin
         .registerWith(
             registrarFor("com.baseflow.googleapiavailability.GoogleApiAvailabilityPlugin"));
-    E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin"));
   }
 }

example/android/app/src/androidTest/java/com/baseflow/googleapiavailability/EmbeddingV1ActivityTest.java

@@ -1,3 +1,4 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"