-
yangwu.jia authored
Merge branch 'feature/base_flutter_1.12_upgrade' into feature/base_flutter_1.12_upgrade_for_androidx # Conflicts: # android/build.gradle # example/android/app/build.gradle # ios/Classes/Boost/FlutterBoostPlugin.h
7aaec780
Merge branch 'feature/base_flutter_1.12_upgrade' into feature/base_flutter_1.12_upgrade_for_androidx # Conflicts: # android/build.gradle # example/android/app/build.gradle # ios/Classes/Boost/FlutterBoostPlugin.h