Merge pull request #325 from wanbing/dev_wanbing

demo update
wuba · Aug 14, 2023 · 48c3fdb · 48c3fdb
2 parents 016a410 + 6a6012f
commit 48c3fdb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/test_case/fair_list_demo/android/build.gradle b/test_case/fair_list_demo/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
- ext.kotlin_version = '1.5.31'
+ ext.kotlin_version = '1.8.10'
  repositories {
  google()
  jcenter()
@@ -26,6 +26,6 @@ subprojects {
  project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
  delete rootProject.buildDir
 }
diff --git a/test_case/fair_list_demo/android/gradle/wrapper/gradle-wrapper.properties b/test_case/fair_list_demo/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
diff --git a/test_case/fair_list_demo/lib/JRList.dart b/test_case/fair_list_demo/lib/JRList.dart
@@ -13,10 +13,10 @@ class JRListWidget extends StatefulWidget {
 class JRListState extends State<JRListWidget>
 {
  @FairWell("list")
- List list = List();
+ var list = <String>[];
  // 监听listview的滑动
  @FairWell("_scrollController")
- ScrollController _scrollController;
+ late ScrollController _scrollController;
 
  @override
  void initState() {

diff --git a/test_case/fair_list_demo/lib/list_proxy.dart b/test_case/fair_list_demo/lib/list_proxy.dart
@@ -5,8 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 class ListDelegate extends FairDelegate {
- List list = List();
- ScrollController _scrollController;
+ var list = <String>[];
+ late ScrollController _scrollController;
 
  @override
  Map<String, Function> bindFunction() {

diff --git a/test_case/fair_list_demo/pubspec.yaml b/test_case/fair_list_demo/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
- sdk: ">=2.7.0 <3.0.0"
+ sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
  flutter:
@@ -41,7 +41,10 @@ dev_dependencies:
 # Switch to another stable flutter version
 dependency_overrides:
  fair_version:
- path: ../../flutter_version/flutter_3_0_0
+ path: ../../flutter_version/flutter_3_10_0
+ analyzer: 5.6.0
+ dart_style: 2.2.5
+ collection: 1.17.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec