[flutter_local_notifications] Upgraded Android Gradle Plugin to fix A…

…ndroid build (#1781) * Upgraded AGP * Moved comment * Fixed example build issues and analysis issues * Updated flutter version constraint * Use a fork of the timezone package * Reverted timezone plugin change * Revert "Reverted timezone plugin change" This reverts commit e876192.
MaikuB · Nov 24, 2022 · 06d7906 · 06d7906
1 parent d65e618
commit 06d7906
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 25 deletions.
diff --git a/flutter_local_notifications/android/build.gradle b/flutter_local_notifications/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
     }
 }
 

diff --git a/flutter_local_notifications/example/analysis_options.yaml b/flutter_local_notifications/example/analysis_options.yaml
@@ -71,7 +71,7 @@ linter:
     - leading_newlines_in_multiline_strings
     - library_names
     - library_prefixes
-    - lines_longer_than_80_chars
+    # - lines_longer_than_80_chars
     - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings

diff --git a/flutter_local_notifications/example/android/app/build.gradle b/flutter_local_notifications/example/android/app/build.gradle
@@ -60,11 +60,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    // Temporary workaround as per https://issuetracker.google.com/issues/158060799
-    lintOptions {
-        checkReleaseBuilds false
-    }
 }
 
 flutter {

diff --git a/flutter_local_notifications/example/android/build.gradle b/flutter_local_notifications/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/flutter_local_notifications/example/android/gradle.properties b/flutter_local_notifications/example/android/gradle.properties
@@ -3,4 +3,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
 # https://github.com/robolectric/robolectric/issues/6521
-android.jetifier.blacklist=bcprov
+android.jetifier.ignorelist=bcprov
diff --git a/flutter_local_notifications/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_local_notifications/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat May 14 14:15:09 AEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/flutter_local_notifications/example/lib/main.dart b/flutter_local_notifications/example/lib/main.dart
@@ -1,15 +1,14 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:flutter_native_timezone/flutter_native_timezone.dart';
+import 'package:flutter_timezone/flutter_timezone.dart';
 import 'package:http/http.dart' as http;
 import 'package:image/image.dart' as image;
 import 'package:path_provider/path_provider.dart';
@@ -209,7 +208,7 @@ Future<void> _configureLocalTimeZone() async {
     return;
   }
   tz.initializeTimeZones();
-  final String? timeZoneName = await FlutterNativeTimezone.getLocalTimezone();
+  final String? timeZoneName = await FlutterTimezone.getLocalTimezone();
   tz.setLocalLocation(tz.getLocation(timeZoneName!));
 }
 
@@ -2392,7 +2391,7 @@ class _HomePageState extends State<HomePage> {
     if (Platform.isAndroid) {
       final DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
       final AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
-      if (androidInfo.version.sdkInt! < 23) {
+      if (androidInfo.version.sdkInt < 23) {
         return const Text(
           '"getActiveNotifications" is available only for Android 6.0 or newer',
         );

diff --git a/flutter_local_notifications/example/macos/Flutter/GeneratedPluginRegistrant.swift b/flutter_local_notifications/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,14 +5,14 @@
 import FlutterMacOS
 import Foundation
 
-import device_info_plus_macos
+import device_info_plus
 import flutter_local_notifications
-import flutter_native_timezone
+import flutter_timezone
 import path_provider_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
-  FlutterNativeTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterNativeTimezonePlugin"))
+  FlutterTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterTimezonePlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
 }
diff --git a/flutter_local_notifications/example/pubspec.yaml b/flutter_local_notifications/example/pubspec.yaml
@@ -4,12 +4,12 @@ publish_to: none
 
 dependencies:
   cupertino_icons: ^1.0.2
-  device_info_plus: ^4.1.3
+  device_info_plus: ^8.0.0
   flutter:
     sdk: flutter
   flutter_local_notifications:
     path: ../
-  flutter_native_timezone: ^2.0.0
+  flutter_timezone: ^1.0.4
   http: ^0.13.4
   image: ^3.0.8
   path_provider: ^2.0.0

diff --git a/flutter_local_notifications/pubspec.yaml b/flutter_local_notifications/pubspec.yaml
@@ -37,4 +37,4 @@ flutter:
 
 environment:
   sdk: ">=2.15.0 <3.0.0"
-  flutter: ">=2.8.0"
+  flutter: ">=3.0.0"
diff --git a/flutter_local_notifications/test/android_flutter_local_notifications_test.dart b/flutter_local_notifications/test/android_flutter_local_notifications_test.dart
@@ -1,4 +1,3 @@
-import 'dart:typed_data';
 import 'package:clock/clock.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

diff --git a/flutter_local_notifications/test/ios_flutter_local_notifications_test.dart b/flutter_local_notifications/test/ios_flutter_local_notifications_test.dart
@@ -163,7 +163,6 @@ void main() {
               requestAlertPermission: false,
               requestBadgePermission: false,
               requestSoundPermission: false,
-              requestCriticalPermission: false,
               defaultPresentAlert: false,
               defaultPresentBadge: false,
               defaultPresentSound: false);

diff --git a/flutter_local_notifications/test/macos_flutter_local_notifications_test.dart b/flutter_local_notifications/test/macos_flutter_local_notifications_test.dart
@@ -62,7 +62,6 @@ void main() {
         requestAlertPermission: false,
         requestBadgePermission: false,
         requestSoundPermission: false,
-        requestCriticalPermission: false,
         defaultPresentAlert: false,
         defaultPresentBadge: false,
         defaultPresentSound: false,