Skip to content

Commit

Permalink
Merge pull request #358 from Blues9527/f-3.13.0-blues
Browse files Browse the repository at this point in the history
[feature] Support Flutter 3.13.x  & update example/test_case
  • Loading branch information
wanbing authored Nov 3, 2023
2 parents 34bb433 + 08e19c9 commit 81590cd
Show file tree
Hide file tree
Showing 439 changed files with 23,189 additions and 5,688 deletions.
6 changes: 3 additions & 3 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.example"
minSdkVersion 19
targetSdkVersion 30
minSdkVersion 20
targetSdkVersion 31
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand All @@ -55,5 +55,5 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
3 changes: 2 additions & 1 deletion example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustResize"
android:exported="true">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
Expand Down
22 changes: 19 additions & 3 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,34 @@
buildscript {
ext.kotlin_version = '1.8.10'
ext.kotlin_version = '1.8.0'
repositories {
maven {
allowInsecureProtocol = true
url 'https://maven.aliyun.com/repository/jcenter'
}
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
maven {
allowInsecureProtocol = true
url 'https://maven.aliyun.com/repository/jcenter'
}
maven {
allowInsecureProtocol = true
url 'https://maven.aliyun.com/repository/google'
}
maven {
allowInsecureProtocol = true
url 'http://maven.aliyun.com/nexus/content/groups/public/'
}
google()
jcenter()
}
Expand All @@ -26,6 +42,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "f8e618a1c8d026e7cb779d0527b55702"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.172230.
# Generated by Fair on 2023-10-31 10:53:29.055437.

source: example|lib/best_flutter_ui/component/home_list.dart
md5: 1f763bd5997d742302ba8ce22cf595c9
md5: df2fb754edb75b2b64559cc1ef963e14
json: example|build/fair/lib_best_flutter_ui_component_home_list.fair.json
date: 2023-05-16 17:00:06.172276
date: 2023-10-31 10:53:29.055482
Original file line number Diff line number Diff line change
Expand Up @@ -368,5 +368,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "c71e611d0ea685885f67596691287e96"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.183962.
# Generated by Fair on 2023-10-31 10:53:29.040904.

source: example|lib/best_flutter_ui/component/hotel_listview_content.dart
md5: 9b5da932afbdaf3c17fa023200716315
md5: b36b1cbe9f5ec06c6ef6132c34dc409f
json: example|build/fair/lib_best_flutter_ui_component_hotel_listview_content.fair.json
date: 2023-05-16 17:00:06.184140
date: 2023-10-31 10:53:29.041067
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "1993ec6c374b699c43a4d29b6654b853"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.152348.
# Generated by Fair on 2023-10-31 10:53:29.074415.

source: example|lib/best_flutter_ui/feedback_screen.dart
md5: 177e27ea81b4826851fdc0838254371e
md5: 46370672f312947e0bd06e8e4e9d8af3
json: example|build/fair/lib_best_flutter_ui_feedback_screen.fair.json
date: 2023-05-16 17:00:06.152448
date: 2023-10-31 10:53:29.074526
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "a5302bcd8904f1273241fccba29541a2"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.216390.
# Generated by Fair on 2023-10-31 10:53:29.084137.

source: example|lib/best_flutter_ui/help_screen.dart
md5: 36e4633076d65d05b573dd6a65d5be31
md5: 2f008247e34b9af5b19d04f329c0d746
json: example|build/fair/lib_best_flutter_ui_help_screen.fair.json
date: 2023-05-16 17:00:06.216490
date: 2023-10-31 10:53:29.084255
Original file line number Diff line number Diff line change
Expand Up @@ -223,5 +223,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "0ad7d3e4f1d1f79c4158b3f0470e9dce"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.225999.
# Generated by Fair on 2023-10-31 10:53:29.092573.

source: example|lib/best_flutter_ui/invite_friend_screen.dart
md5: 4904771600e5888344da62190bd8aad2
md5: b419d1d4bf78fd42bf1b094fa647b680
json: example|build/fair/lib_best_flutter_ui_invite_friend_screen.fair.json
date: 2023-05-16 17:00:06.226097
date: 2023-10-31 10:53:29.092677
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
"_itemBuilder": {
"className": "Container"
}
}
},
"digest": "738ff06e1e42523795d77960a016b525"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.205176.
# Generated by Fair on 2023-10-31 10:53:28.985160.

source: example|lib/fair_widget/fair_delegate_widget.dart
md5: b6dc09d65832729dcbeb54f8c587bf91
md5: 4c0d73440d0bd147776fa5184dc3835c
json: example|build/fair/lib_fair_widget_fair_delegate_widget.fair.json
date: 2023-05-16 17:00:06.205231
date: 2023-10-31 10:53:28.985224
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "3603040f2e2cb2d8ae3c200b08e85062"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.084617.
# Generated by Fair on 2023-10-31 10:53:29.100833.

source: example|lib/fair_widget/fair_plugin_widget.dart
md5: b77b062a6450fab531e3428d591fb5e4
md5: cffd851be6c426bf983fb077075fad19
json: example|build/fair/lib_fair_widget_fair_plugin_widget.fair.json
date: 2023-05-16 17:00:06.084677
date: 2023-10-31 10:53:29.100916
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "63f30c5614414d8cd9e315a8bbb3de67"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.021210.
# Generated by Fair on 2023-10-31 10:53:28.996912.

source: example|lib/fair_widget/fair_props_widget.dart
md5: 2826f90df6725f256080c8421c2d2d6a
md5: f609a09df143913f51e3547f9bd3fa4e
json: example|build/fair/lib_fair_widget_fair_props_widget.fair.json
date: 2023-05-16 17:00:06.021274
date: 2023-10-31 10:53:28.996953
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "19acbe84f2fc9b1af2a72025d735b39a"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:05.990381.
# Generated by Fair on 2023-10-31 10:53:28.991746.

source: example|lib/fair_widget/fairbinding/fair_binding_sample.dart
md5: c75fe0eec710da949fbb394cfa68824d
md5: 50d35e75a6ba9e417199781df8f93a3d
json: example|build/fair/lib_fair_widget_fairbinding_fair_binding_sample.fair.json
date: 2023-05-16 17:00:05.990436
date: 2023-10-31 10:53:28.991789
3 changes: 2 additions & 1 deletion example/assets/fair/lib_json_file_explain.fair.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,6 @@
"title"
]
}
}
},
"digest": "a2d5ea46d61a63f63c9cc7d256d6c9dd"
}
6 changes: 3 additions & 3 deletions example/assets/fair/lib_json_file_explain.fair.metadata
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.038321.
# Generated by Fair on 2023-10-31 10:53:28.969805.

source: example|lib/json_file_explain.dart
md5: ba280911c77bc4f2b70c10d031f8ceaa
md5: fd39c25e84402b622ba0dc2d174272fe
json: example|build/fair/lib_json_file_explain.fair.json
date: 2023-05-16 17:00:06.038373
date: 2023-10-31 10:53:28.969874
3 changes: 2 additions & 1 deletion example/assets/fair/lib_main.fair.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "a5b1303b82b3f77de8e67850400b9c1e"
}
6 changes: 3 additions & 3 deletions example/assets/fair/lib_main.fair.metadata
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.133895.
# Generated by Fair on 2023-10-31 10:53:29.126396.

source: example|lib/main.dart
md5: c68d158f9f232ce868ca772b68f4e864
md5: c037c1cc5521a6558ebf16935f7d728c
json: example|build/fair/lib_main.fair.json
date: 2023-05-16 17:00:06.134
date: 2023-10-31 10:53:29.126442
3 changes: 2 additions & 1 deletion example/assets/fair/lib_page2page_page_one.fair.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "9790d0d1bfec1cf55952ccc682614fa2"
}
6 changes: 3 additions & 3 deletions example/assets/fair/lib_page2page_page_one.fair.metadata
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.058408.
# Generated by Fair on 2023-10-31 10:53:29.109990.

source: example|lib/page2page/page_one.dart
md5: 5e0a2134e417468d4318f8c8242b2e3e
md5: 0e2b8fdbfdc55e2469870cb9462b403c
json: example|build/fair/lib_page2page_page_one.fair.json
date: 2023-05-16 17:00:06.058471
date: 2023-10-31 10:53:29.110033
3 changes: 2 additions & 1 deletion example/assets/fair/lib_page2page_page_two.fair.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "94973711a4be97191459e77c105a6441"
}
6 changes: 3 additions & 3 deletions example/assets/fair/lib_page2page_page_two.fair.metadata
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.142706.
# Generated by Fair on 2023-10-31 10:53:29.064704.

source: example|lib/page2page/page_two.dart
md5: 667130ca0c77da994c29aecd3bebf0bb
md5: 363e74697451248cf0f2fc2376a6f3a7
json: example|build/fair/lib_page2page_page_two.fair.json
date: 2023-05-16 17:00:06.142748
date: 2023-10-31 10:53:29.064752
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "e593158025d5b81cf30acb5bf41410ac"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.108931.
# Generated by Fair on 2023-10-31 10:53:28.963318.

source: example|lib/template/appbar/appbar_template.dart
md5: e5f4cb764283d409724ea14fe006ecf2
md5: 1d724f88d4e38df16b49eb3d05a3df01
json: example|build/fair/lib_template_appbar_appbar_template.fair.json
date: 2023-05-16 17:00:06.108996
date: 2023-10-31 10:53:28.963369
Original file line number Diff line number Diff line change
Expand Up @@ -373,5 +373,6 @@
}
}
}
}
},
"digest": "0bc5998caa5d7d3837a692bd5947b1f3"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.121449.
# Generated by Fair on 2023-10-31 10:53:29.002185.

source: example|lib/template/detail_page/fair_detail.dart
md5: 285ee91c30d7e5f110a846775136a0c9
md5: 97e0d468098c76fdd996408a4aecc553
json: example|build/fair/lib_template_detail_page_fair_detail.fair.json
date: 2023-05-16 17:00:06.121573
date: 2023-10-31 10:53:29.002332
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "03e886825ea89c448eab05f2c0f28bec"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by Fair on 2023-05-16 17:00:06.046980.
# Generated by Fair on 2023-10-31 10:53:29.014322.

source: example|lib/template/drawer/drawer_template.dart
md5: 368e50aa99209d6277ff3563a01d7e83
md5: aee48024646cf7db87015165b2a08eec
json: example|build/fair/lib_template_drawer_drawer_template.fair.json
date: 2023-05-16 17:00:06.047101
date: 2023-10-31 10:53:29.014382
3 changes: 2 additions & 1 deletion example/assets/fair/lib_template_fab_fab_template.fair.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
}
}
},
"methodMap": {}
"methodMap": {},
"digest": "55d7a801f77713bfdcb425941680e578"
}
Loading

0 comments on commit 81590cd

Please sign in to comment.