Skip to content

Commit 8e65194

Browse files
author
yangwu.jia
committed
Merge branch 'feature/flutter_1.9_upgrade'
# Conflicts: # android/src/main/java/com/idlefish/flutterboost/BoostFlutterView.java # android/src/main/java/com/idlefish/flutterboost/XFlutterView.java # ios/Classes/container/FLBFlutterViewContainer.m
2 parents 42586f7 + 3d998dc commit 8e65194

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+4040
-2804
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ example/android/app/.classpath
1717
example/android/app/.project
1818
example/android/.project
1919
flutter_boost
20-
example

android/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626
buildToolsVersion '27.0.3'
2727
defaultConfig {
2828
minSdkVersion 16
29+
targetSdkVersion 28
2930
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3031
}
3132
lintOptions {
@@ -34,9 +35,12 @@ android {
3435
}
3536

3637
dependencies {
38+
implementation 'com.android.support:appcompat-v7:28.0.0'
39+
implementation 'com.android.support:design:28.0.0'
40+
implementation 'com.android.support:support-v4:28.0.0'
41+
implementation 'android.arch.lifecycle:common-java8:1.1.1'
3742
implementation 'com.alibaba:fastjson:1.2.41'
38-
implementation 'com.android.support:support-v4:26.1.0'
39-
implementation 'com.android.support:appcompat-v7:26.1.0'
43+
4044
}
4145

4246
ext {
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.idlefish.flutterboost">
33

4-
<application>
5-
<activity android:name="com.idlefish.flutterboost.containers.BoostFlutterDefaultActivity" />
6-
</application>
4+
75

86
</manifest>

android/src/main/java/com/idlefish/flutterboost/BoostChannel.java

Lines changed: 0 additions & 191 deletions
This file was deleted.

android/src/main/java/com/idlefish/flutterboost/BoostEngineProvider.java

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)