feat!: upgrade to Dart 2.16.0 and Flutter 2.10.0 (#290)

cbl-dart · Feb 3, 2022 · 5d8d082 · 5d8d082
1 parent 35d6eb5
commit 5d8d082
Show file tree

Hide file tree

Showing 45 changed files with 74 additions and 81 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,9 +9,9 @@ on:
       - main
 
 env:
-  flutter-version-stable: '2.8.0'
+  flutter-version-stable: 2.10.0
   flutter-version-beta: beta
-  dart-version-stable: '2.15.0'
+  dart-version-stable: 2.16.0
   dart-version-beta: beta
   melos-version: '1.0.0'
 
@@ -66,7 +66,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v1
+        uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.flutter-version-stable }}
 
@@ -103,7 +103,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v1
+        uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.flutter-version-stable }}
 
@@ -184,7 +184,7 @@ jobs:
       - name: Setup Flutter
         # TODO: fix melos so it does not require flutter
         # if: matrix.embedder == 'flutter'
-        uses: subosito/flutter-action@v1
+        uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.flutter-version-stable }}
 
@@ -272,7 +272,7 @@ jobs:
           sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v1
+        uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.flutter-version-stable }}
 
@@ -340,7 +340,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v1
+        uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ env.flutter-version-stable }}
 

diff --git a/packages/cbl/example/pubspec.yaml b/packages/cbl/example/pubspec.yaml
@@ -2,7 +2,7 @@ name: cbl_example
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
-  cbl: ^1.0.0-beta.14
+  cbl: ^1.0.0-beta.14
diff --git a/packages/cbl/lib/src/couchbase_lite.dart b/packages/cbl/lib/src/couchbase_lite.dart
@@ -20,7 +20,7 @@ class CouchbaseLite {
 
   /// Initializes the `cbl` package, for the main isolate.
   static Future<void> init({required LibrariesConfiguration libraries}) =>
-      asyncOperationTracePoint(() => InitializeOp(), () async {
+      asyncOperationTracePoint(InitializeOp.new, () async {
         await initPrimaryIsolate(IsolateContext(libraries: libraries));
 
         _setupLogging();
@@ -36,7 +36,7 @@ class CouchbaseLite {
   ///
   /// A value for [context] can be obtained from [CouchbaseLite.context].
   static Future<void> initSecondary(Object context) =>
-      asyncOperationTracePoint(() => InitializeOp(), () async {
+      asyncOperationTracePoint(InitializeOp.new, () async {
         if (context is! IsolateContext) {
           throw ArgumentError.value(context, 'context', 'is invalid');
         }

diff --git a/packages/cbl/lib/src/database/proxy_database.dart b/packages/cbl/lib/src/database/proxy_database.dart
@@ -122,8 +122,8 @@ class ProxyDatabase extends ProxyObject
       );
 
   @override
-  Future<DocumentFragment> operator [](String id) => use(
-      () => document(id).then((document) => DocumentFragmentImpl(document)));
+  Future<DocumentFragment> operator [](String id) =>
+      use(() => document(id).then(DocumentFragmentImpl.new));
 
   @override
   Future<bool> saveDocument(

diff --git a/packages/cbl/lib/src/fleece/integration/array.dart b/packages/cbl/lib/src/fleece/integration/array.dart
@@ -168,6 +168,6 @@ class MArray extends MCollection {
 
     return context!.decoder
         .loadValueFromArray(array, index)
-        ?.let((it) => MValue.withValue(it));
+        ?.let(MValue.withValue);
   }
 }
diff --git a/packages/cbl/lib/src/fleece/integration/dict.dart b/packages/cbl/lib/src/fleece/integration/dict.dart
@@ -162,8 +162,6 @@ class MDict extends MCollection {
       return null;
     }
 
-    return context!.decoder
-        .loadValueFromDict(dict, key)
-        ?.let((it) => MValue.withValue(it));
+    return context!.decoder.loadValueFromDict(dict, key)?.let(MValue.withValue);
   }
 }
diff --git a/packages/cbl/lib/src/service/cbl_service.dart b/packages/cbl/lib/src/service/cbl_service.dart
@@ -522,7 +522,7 @@ class CblService {
   void _setQueryParameters(SetQueryParameters request) {
     _getQueryById(request.queryId).query.setParameters(
           (request.parameters?.toPlainObject() as StringMap?)
-              ?.let((it) => Parameters(it)),
+              ?.let(Parameters.new),
         );
   }
 

diff --git a/packages/cbl/lib/src/support/async_callback.dart b/packages/cbl/lib/src/support/async_callback.dart
@@ -144,7 +144,7 @@ class AsyncCallback implements NativeResource<CBLDartAsyncCallback> {
         _debugLog('sending result: $result');
       }
 
-      sendPort!.send([callAddress, result]);
+      sendPort.send([callAddress, result]);
     }
 
     Future.sync(() => handler(args)).then(

diff --git a/packages/cbl/pubspec.yaml b/packages/cbl/pubspec.yaml
@@ -8,7 +8,7 @@ repository: https://github.com/cbl-dart/cbl-dart
 issue_tracker: https://github.com/cbl-dart/cbl-dart/issues
 
 environment:
-  sdk: '>=2.13.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
   cbl_ffi: ^0.7.0-beta.11

diff --git a/packages/cbl_dart/example/pubspec.yaml b/packages/cbl_dart/example/pubspec.yaml
@@ -2,8 +2,8 @@ name: cbl_dart_example
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
   cbl: ^1.0.0-beta.14
-  cbl_dart: ^1.0.0-beta.5
+  cbl_dart: ^1.0.0-beta.5
diff --git a/packages/cbl_dart/lib/cbl_dart.dart b/packages/cbl_dart/lib/cbl_dart.dart
@@ -36,7 +36,7 @@ class CouchbaseLiteDart {
     String? filesDir,
     String? nativeLibrariesDir,
   }) =>
-      asyncOperationTracePoint(() => InitializeOp(), () async {
+      asyncOperationTracePoint(InitializeOp.new, () async {
         final context = filesDir == null ? null : await _initContext(filesDir);
 
         final libraries = await acquireLibraries(

diff --git a/packages/cbl_dart/pubspec.yaml b/packages/cbl_dart/pubspec.yaml
@@ -9,7 +9,7 @@ repository: https://github.com/cbl-dart/cbl-dart
 issue_tracker: https://github.com/cbl-dart/cbl-dart/issues
 
 environment:
-  sdk: '>=2.13.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
   cbl: ^1.0.0-beta.14

diff --git a/packages/cbl_e2e_tests/lib/src/document/array_test.dart b/packages/cbl_e2e_tests/lib/src/document/array_test.dart
@@ -225,15 +225,15 @@ void main() {
 
       test('set values', () {
         setValuesTest(
-          build: (state) => MutableArray(state),
+          build: MutableArray.new,
           initialValue: 'a',
         );
         setValuesTest(
           build: (state) => immutableArray(state).toMutable(),
           initialValue: 'a',
         );
         setValuesTest(
-          build: (state) => MutableArray(state),
+          build: MutableArray.new,
           initialValue: <Object?>[],
         );
         setValuesTest(

diff --git a/packages/cbl_e2e_tests/lib/src/document/dictionary_test.dart b/packages/cbl_e2e_tests/lib/src/document/dictionary_test.dart
@@ -243,15 +243,15 @@ void main() {
 
       test('set values', () {
         setValuesTest(
-          build: (state) => MutableDictionary(state),
+          build: MutableDictionary.new,
           initialValue: 'a',
         );
         setValuesTest(
           build: (state) => immutableDictionary(state).toMutable(),
           initialValue: 'a',
         );
         setValuesTest(
-          build: (state) => MutableDictionary(state),
+          build: MutableDictionary.new,
           initialValue: <Object?>{},
         );
         setValuesTest(

diff --git a/packages/cbl_e2e_tests/pubspec.yaml b/packages/cbl_e2e_tests/pubspec.yaml
@@ -2,7 +2,7 @@ name: cbl_e2e_tests
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
   benchmark_harness: ^2.0.0

diff --git a/packages/cbl_e2e_tests_flutter/android/app/build.gradle b/packages/cbl_e2e_tests_flutter/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +45,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.terwesten.gabriel.cbl_e2e_tests_flutter"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/packages/cbl_e2e_tests_flutter/android/app/src/main/AndroidManifest.xml b/packages/cbl_e2e_tests_flutter/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

diff --git a/packages/cbl_e2e_tests_flutter/android/build.gradle b/packages/cbl_e2e_tests_flutter/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/cbl_e2e_tests_flutter/integration_test/test_binding_impl.dart b/packages/cbl_e2e_tests_flutter/integration_test/test_binding_impl.dart
@@ -21,7 +21,7 @@ void setupTestBinding() {
 
 class FlutterCblE2eTestBinding extends CblE2eTestBinding {
   static void ensureInitialized() {
-    CblE2eTestBinding.ensureInitialized(() => FlutterCblE2eTestBinding());
+    CblE2eTestBinding.ensureInitialized(FlutterCblE2eTestBinding.new);
   }
 
   @override

diff --git a/packages/cbl_e2e_tests_flutter/pubspec.yaml b/packages/cbl_e2e_tests_flutter/pubspec.yaml
@@ -3,8 +3,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
-  flutter: '>=2.8.0'
+  sdk: '>=2.16.0 <3.0.0'
+  flutter: '>=2.10.0'
 
 dependencies:
   benchmark_harness: ^2.0.0

diff --git a/packages/cbl_e2e_tests_standalone_dart/pubspec.yaml b/packages/cbl_e2e_tests_standalone_dart/pubspec.yaml
@@ -2,7 +2,7 @@ name: cbl_e2e_tests_standalone_dart
 publish_to: none
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
   benchmark_harness: ^2.0.0

diff --git a/packages/cbl_e2e_tests_standalone_dart/test/test_binding_impl.dart b/packages/cbl_e2e_tests_standalone_dart/test/test_binding_impl.dart
@@ -12,8 +12,7 @@ void setupTestBinding() {
 
 class StandaloneDartCblE2eTestBinding extends CblE2eTestBinding {
   static void ensureInitialized() {
-    CblE2eTestBinding.ensureInitialized(
-        () => StandaloneDartCblE2eTestBinding());
+    CblE2eTestBinding.ensureInitialized(StandaloneDartCblE2eTestBinding.new);
   }
 
   @override

diff --git a/packages/cbl_ffi/lib/src/slice.dart b/packages/cbl_ffi/lib/src/slice.dart
@@ -182,15 +182,13 @@ class SliceResult extends Slice {
 
   /// Creates a [SliceResult] from a [FLSlice] by copying its content.
   static SliceResult? copyFLSlice(FLSlice slice) =>
-      Slice.fromFLSlice(slice)?.let((slice) => SliceResult.fromSlice(slice));
+      Slice.fromFLSlice(slice)?.let(SliceResult.fromSlice);
 
   /// Creates a [SliceResult] from a [FLSliceResult] by copying its content.
-  static SliceResult? copyFLSliceResult(
-          FLSliceResult slice) =>
+  static SliceResult? copyFLSliceResult(FLSliceResult slice) =>
       slice.buf == nullptr
           ? null
-          : Slice._(slice.buf, slice.size)
-              .let((slice) => SliceResult.fromSlice(slice));
+          : Slice._(slice.buf, slice.size).let(SliceResult.fromSlice);
 
   static final _keepAliveForTypedList = Expando<Slice>();
 

diff --git a/packages/cbl_ffi/pubspec.yaml b/packages/cbl_ffi/pubspec.yaml
@@ -7,7 +7,7 @@ repository: https://github.com/cbl-dart/cbl-dart
 issue_tracker: https://github.com/cbl-dart/cbl-dart/issues
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
   cbl_libcblite_api: 3.0.0-beta.2

diff --git a/packages/cbl_flutter/example/android/app/build.gradle b/packages/cbl_flutter/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +45,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.terwesten.gabriel.cbl_flutter_example"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

diff --git a/packages/cbl_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/cbl_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

diff --git a/packages/cbl_flutter/example/android/build.gradle b/packages/cbl_flutter/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()

diff --git a/packages/cbl_flutter/example/lib/main.dart b/packages/cbl_flutter/example/lib/main.dart
@@ -268,10 +268,9 @@ class LogMessageRepository {
     // 4|0|0| SEARCH TABLE kv_default AS example USING INDEX type+createdAt (<expr>=?)
     Future(query.explain).then(print);
 
-    return query.changes().asyncMap((change) => change.results
-        .asStream()
-        .map((result) => CblLogMessage(result))
-        .toList());
+    return query.changes().asyncMap(
+          (change) => change.results.asStream().map(CblLogMessage.new).toList(),
+        );
   }
 }
 

diff --git a/packages/cbl_flutter/example/pubspec.yaml b/packages/cbl_flutter/example/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 
 dependencies:
   cbl: ^1.0.0-beta.14

diff --git a/packages/cbl_flutter/lib/cbl_flutter.dart b/packages/cbl_flutter/lib/cbl_flutter.dart
@@ -16,7 +16,7 @@ class CouchbaseLiteFlutter {
 
   /// Initializes the `cbl` package, for the main isolate.
   static Future<void> init() =>
-      asyncOperationTracePoint(() => InitializeOp(), () async {
+      asyncOperationTracePoint(InitializeOp.new, () async {
         await initPrimaryIsolate(IsolateContext(
           libraries: CblFlutterPlatform.instance.libraries(),
           initContext: await _context(),

diff --git a/packages/cbl_flutter/pubspec.yaml b/packages/cbl_flutter/pubspec.yaml
@@ -9,8 +9,8 @@ repository: https://github.com/cbl-dart/cbl-dart
 issue_tracker: https://github.com/cbl-dart/cbl-dart/issues
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
-  flutter: '>=2.8.0'
+  sdk: '>=2.16.0 <3.0.0'
+  flutter: '>=2.10.0'
 
 dependencies:
   cbl: ^1.0.0-beta.14