Merge remote-tracking branch 'official/main' into directory-picker

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.1.0+1
+
+* Android: require `compileSdk 33`
+
+## 2.1.0
+
+* Android: Upgrade to AGP 8.1.0, remove deprecated plugin registration, upgrade dependencies, etc.
+* Require Dart >= 3.0.0
+* Analyzer warning cleanup.
+
 ## 2.0.3
 
 * iOS: Obtain iOS bookmark only after ensuring the file exists locally

analysis_options.yaml

@@ -4,170 +4,17 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
   errors:
     # treat missing required parameters as a warning (not a hint)
     missing_required_param: warning
     # treat missing returns as a warning (not a hint)
     missing_return: warning
     # allow having TODOs in the code
     todo: ignore
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 linter:
   rules:
-    # these rules are documented on and in the same order as
-    # the Dart Lint rules page to make maintenance easier
-    # http://dart-lang.github.io/linter/lints/
-
-    # HP mostly in sync with https://github.com/flutter/flutter/blob/master/analysis_options.yaml
-
-    - always_declare_return_types
-    - always_put_control_body_on_new_line
-    # - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
-    - always_require_non_null_named_parameters
-    # - always_specify_types
-    - annotate_overrides
-    # - avoid_annotating_with_dynamic # not yet tested
-    # - avoid_as
-    - avoid_bool_literals_in_conditional_expressions
-    # - avoid_catches_without_on_clauses # not yet tested
-    # - avoid_catching_errors # not yet tested
-    # - avoid_classes_with_only_static_members # not yet tested
-    # - avoid_double_and_int_checks # only useful when targeting JS runtime
-    - avoid_empty_else
-    - avoid_field_initializers_in_const_classes
-    - avoid_function_literals_in_foreach_calls
-    # - avoid_implementing_value_types # not yet tested
-    - avoid_init_to_null
-    # - avoid_js_rounded_ints # only useful when targeting JS runtime
-    - avoid_null_checks_in_equality_operators
-    # - avoid_positional_boolean_parameters # not yet tested
-    # - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
-    - avoid_relative_lib_imports
-    - avoid_renaming_method_parameters
-    - avoid_return_types_on_setters
-    # - avoid_returning_null # not yet tested
-    # - avoid_returning_null_for_future # not yet tested
-    - avoid_returning_null_for_void
-    # - avoid_returning_this # not yet tested
-    # - avoid_setters_without_getters # not yet tested
-    # - avoid_shadowing_type_parameters # not yet tested
-    # - avoid_single_cascade_in_expression_statements # not yet tested
-    - avoid_slow_async_io
-    - avoid_types_as_parameter_names
-    # - avoid_types_on_closure_parameters # not yet tested
-    - avoid_unused_constructor_parameters
-    - avoid_void_async
-    - await_only_futures
-    - camel_case_extensions
-    - camel_case_types
-    - cancel_subscriptions
-    # - cascade_invocations # not yet tested
-    # - close_sinks # not reliable enough
-    # - comment_references # blocked on https://github.com/flutter/flutter/issues/20765
-    # - constant_identifier_names # https://github.com/dart-lang/linter/issues/204
-    - control_flow_in_finally
-    - curly_braces_in_flow_control_structures
-    # - diagnostic_describe_all_properties # not yet tested
-    - directives_ordering
-    - empty_catches
-    - empty_constructor_bodies
-    - empty_statements
-    # - file_names # not yet tested
-    # - flutter_style_todos TODO(HP)
-    - hash_and_equals
-    - implementation_imports
-    # - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
-    - iterable_contains_unrelated_type
-    # - join_return_with_assignment # not yet tested
-    - library_names
-    - library_prefixes
-    # - lines_longer_than_80_chars # not yet tested
-    - list_remove_unrelated_type
-    # - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
-    - no_adjacent_strings_in_list
-    - no_duplicate_case_values
-    - non_constant_identifier_names
-    # - null_closures  # not yet tested
-    # - omit_local_variable_types # opposite of always_specify_types
-    # - one_member_abstracts # too many false positives
-    # - only_throw_errors # https://github.com/flutter/flutter/issues/5792
-    - overridden_fields
-    - package_api_docs
-    - package_names
-    - package_prefixed_library_names
-    # - parameter_assignments # we do this commonly
-    - prefer_adjacent_string_concatenation
-    - prefer_asserts_in_initializer_lists
-    # - prefer_asserts_with_message # not yet tested
-    - prefer_collection_literals
-    - prefer_conditional_assignment
-    - prefer_const_constructors
-    - prefer_const_constructors_in_immutables
-    - prefer_const_declarations
-    - prefer_const_literals_to_create_immutables
-    # - prefer_constructors_over_static_methods # not yet tested
-    - prefer_contains
-    # - prefer_double_quotes # opposite of prefer_single_quotes
-    - prefer_equal_for_default_values
-    # - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
-    - prefer_final_fields
-    - prefer_final_in_for_each
-    - prefer_final_locals
-    - prefer_for_elements_to_map_fromIterable
-    - prefer_foreach
-    # - prefer_function_declarations_over_variables # not yet tested
-    - prefer_generic_function_type_aliases
-    # - prefer_if_elements_to_conditional_expressions # not yet tested
-    - prefer_if_null_operators
-    - prefer_initializing_formals
-    - prefer_inlined_adds
-    # - prefer_int_literals # not yet tested
-    # - prefer_interpolation_to_compose_strings # not yet tested
-    - prefer_is_empty
-    - prefer_is_not_empty
-    - prefer_iterable_whereType
-    # - prefer_mixin # https://github.com/dart-lang/language/issues/32
-    # - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932
-    - prefer_single_quotes
-    - prefer_spread_collections
-    - prefer_typing_uninitialized_variables
-    - prefer_void_to_null
-    # - provide_deprecation_message # not yet tested
-    # - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml
-    - recursive_getters
-    - slash_for_doc_comments
-    # - sort_child_properties_last # not yet tested
-    - sort_constructors_first
-    #- sort_pub_dependencies
-    - sort_unnamed_constructors_first
-    - test_types_in_equals
-    - throw_in_finally
-    # - type_annotate_public_apis # subset of always_specify_types
-    - type_init_formals
-    # - unawaited_futures # https://github.com/flutter/flutter/issues/5793
-    # - unnecessary_await_in_return # not yet tested
-    - unnecessary_brace_in_string_interps
-    - unnecessary_const
-    - unnecessary_getters_setters
-    # - unnecessary_lambdas # https://github.com/dart-lang/linter/issues/498
-    - unnecessary_new
-    - unnecessary_null_aware_assignments
-    - unnecessary_null_in_if_null_operators
-    - unnecessary_overrides
-    #- unnecessary_parenthesis HP: I like parenthesis :-)
-    - unnecessary_statements
-    - unnecessary_this
-    - unrelated_type_equality_checks
-    # - unsafe_html # not yet tested
-    - use_full_hex_values_for_flutter_colors
-    # - use_function_type_syntax_for_parameters # not yet tested
-    - use_rethrow_when_possible
-    # - use_setters_to_change_properties # not yet tested
-    # - use_string_buffers # https://github.com/dart-lang/linter/pull/664
-    # - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
-    - valid_regexps
-    - void_checks
-
+    prefer_single_quotes: true

android/build.gradle

@@ -2,30 +2,31 @@ group 'codeux.design.filepicker.file_picker_writable'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    namespace "codeux.design.filepicker.file_picker_writable"
+    compileSdk 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +40,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5"
+    api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
 }

android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="codeux.design.filepicker.file_picker_writable">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 </manifest>

android/src/main/kotlin/codeux/design/filepicker/file_picker_writable/FilePickerWritablePlugin.kt

@@ -2,7 +2,6 @@ package codeux.design.filepicker.file_picker_writable
 
 import android.app.Activity
 import android.net.Uri
-import android.os.Build
 import android.util.Log
 import androidx.annotation.MainThread
 import androidx.annotation.NonNull
@@ -15,13 +14,14 @@ import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
-import io.flutter.plugin.common.PluginRegistry.Registrar
 import kotlinx.coroutines.*
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.util.*
 
+private const val TAG = "FilePickerWritable"
+
 /** FilePickerWritablePlugin */
 class FilePickerWritablePlugin : FlutterPlugin, MethodCallHandler,
   ActivityAware,
@@ -43,7 +43,7 @@ class FilePickerWritablePlugin : FlutterPlugin, MethodCallHandler,
     initializePlugin(flutterPluginBinding.binaryMessenger)
   }
 
-  fun initializePlugin(binaryMessenger: BinaryMessenger) {
+  private fun initializePlugin(binaryMessenger: BinaryMessenger) {
     channel = MethodChannel(
       binaryMessenger,
       "design.codeux.file_picker_writable"
@@ -70,32 +70,6 @@ class FilePickerWritablePlugin : FlutterPlugin, MethodCallHandler,
     })
   }
 
-
-
-  // This static function is optional and equivalent to onAttachedToEngine. It supports the old
-  // pre-Flutter-1.12 Android projects. You are encouraged to continue supporting
-  // plugin registration via this function while apps migrate to use the new Android APIs
-  // post-flutter-1.12 via https://flutter.dev/go/android-project-migration.
-  //
-  // It is encouraged to share logic between onAttachedToEngine and registerWith to keep
-  // them functionally equivalent. Only one of onAttachedToEngine or registerWith will be called
-  // depending on the user's project. onAttachedToEngine or registerWith must both be defined
-  // in the same class.
-  companion object {
-    const val TAG = "FilePickerWritable"
-
-    @Suppress("unused")
-    @JvmStatic
-    fun registerWith(registrar: Registrar) {
-      FilePickerWritablePlugin().initializePlugin(registrar.messenger())
-      Log.w(
-        TAG, "v1 plugin api is unsupported, migrate to v2 " +
-        "https://flutter.dev/go/android-project-migration"
-      )
-    }
-  }
-
-
   override fun onMethodCall(
     @NonNull call: MethodCall,
     @NonNull result: Result
@@ -115,44 +89,11 @@ class FilePickerWritablePlugin : FlutterPlugin, MethodCallHandler,
               ?: throw FilePickerException("Expected argument 'path'")
             impl.openFilePickerForCreate(result, path)
           }
-          "isDirectoryAccessSupported" -> {
-            result.success(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-          }
-          "openDirectoryPicker" -> {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-              val initialDirUri = call.argument<String>("initialDirUri")
-              impl.openDirectoryPicker(result, initialDirUri)
-            } else {
-              throw FilePickerException("${call.method} is not supported on Android ${Build.VERSION.RELEASE}")
-            }
-          }
           "readFileWithIdentifier" -> {
             val identifier = call.argument<String>("identifier")
               ?: throw FilePickerException("Expected argument 'identifier'")
             impl.readFileWithIdentifier(result, identifier)
           }
-          "getDirectory" -> {
-            val rootIdentifier = call.argument<String>("rootIdentifier")
-              ?: throw FilePickerException("Expected argument 'rootIdentifier'")
-            val fileIdentifier = call.argument<String>("fileIdentifier")
-              ?: throw FilePickerException("Expected argument 'fileIdentifier'")
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-              impl.getDirectory(result, rootIdentifier, fileIdentifier)
-            } else {
-              throw FilePickerException("${call.method} is not supported on Android ${Build.VERSION.RELEASE}")
-            }
-          }
-          "resolveRelativePath" -> {
-            val directoryIdentifier = call.argument<String>("directoryIdentifier")
-              ?: throw FilePickerException("Expected argument 'directoryIdentifier'")
-            val relativePath = call.argument<String>("relativePath")
-              ?: throw FilePickerException("Expected argument 'relativePath'")
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-              impl.resolveRelativePath(result, directoryIdentifier, relativePath)
-            } else {
-              throw FilePickerException("${call.method} is not supported on Android ${Build.VERSION.RELEASE}")
-            }
-          }
           "writeFileWithIdentifier" -> {
             val identifier = call.argument<String>("identifier")
               ?: throw FilePickerException("Expected argument 'identifier'")