Skip to content

Commit eca6500

Browse files
charafaucharafau
authored
Remove local properties (#630)
* remove local properties * added jetifier for example project
1 parent 857c8e9 commit eca6500

File tree

14 files changed

+62
-77
lines changed

14 files changed

+62
-77
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
# 0.3.10
1+
# 0.3.10+1
2+
- fixed android build
23

4+
# 0.3.10
35
- add mediaPlaybackRequiresUserGesture parameter
46
- Add ignore ssl error parameter
57

‎android/android.iml‎

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

‎android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buildscript {
2020
}
2121

2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:3.3.2'
23+
classpath 'com.android.tools.build:gradle:3.5.3'
2424
}
2525
}
2626

@@ -53,7 +53,7 @@ android {
5353
}
5454
}
5555
dependencies {
56-
implementation 'androidx.appcompat:appcompat:1.0.2'
56+
implementation 'androidx.appcompat:appcompat:1.1.0'
5757

5858
testImplementation 'junit:junit:4.12'
5959
testImplementation 'androidx.test:core:1.2.0'

‎android/flutter_webview_plugin.iml‎

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":flutter_webview_plugin" />
7-
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.2" />
8-
<option name="LAST_KNOWN_AGP_VERSION" value="3.3.2" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />
99
</configuration>
1010
</facet>
1111
<facet type="android" name="Android">
@@ -19,16 +19,16 @@
1919
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2020
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2121
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
22-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/res/rs/debug;file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/res/resValues/debug" />
23-
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/res/rs/androidTest/debug" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/res/resValues/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2424
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2525
<option name="PROJECT_TYPE" value="1" />
2626
</configuration>
2727
</facet>
2828
</component>
2929
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
30-
<output url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
31-
<output-test url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
30+
<output url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/intermediates/javac/debug/classes" />
31+
<output-test url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/intermediates/javac/debugUnitTest/classes" />
3232
<exclude-output />
3333
<content url="file://$MODULE_DIR$">
3434
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -80,6 +80,15 @@
8080
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out">
8181
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
8282
</content>
83+
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/ap_generated_sources/debug/out">
84+
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
85+
</content>
86+
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/ap_generated_sources/debugAndroidTest/out">
87+
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
88+
</content>
89+
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/ap_generated_sources/debugUnitTest/out">
90+
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
91+
</content>
8392
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out">
8493
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
8594
</content>
@@ -98,15 +107,6 @@
98107
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/res/rs/debug">
99108
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/res/rs/debug" type="java-resource" generated="true" />
100109
</content>
101-
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/apt/androidTest/debug">
102-
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
103-
</content>
104-
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/apt/debug">
105-
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/apt/debug" isTestSource="false" generated="true" />
106-
</content>
107-
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/apt/test/debug">
108-
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/apt/test/debug" isTestSource="true" generated="true" />
109-
</content>
110110
<content url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/buildConfig/androidTest/debug">
111111
<sourceFolder url="file://$MODULE_DIR$/../example/build/flutter_webview_plugin/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
112112
</content>
@@ -116,45 +116,39 @@
116116
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
117117
<orderEntry type="sourceFolder" forTests="false" />
118118
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
119-
<orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-inline:2.28.2@jar" level="project" />
120119
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
120+
<orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-inline:2.28.2@jar" level="project" />
121121
<orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-core:2.28.2@jar" level="project" />
122122
<orderEntry type="library" scope="TEST" name="Gradle: net.bytebuddy:byte-buddy:1.9.10@jar" level="project" />
123123
<orderEntry type="library" scope="TEST" name="Gradle: net.bytebuddy:byte-buddy-agent:1.9.10@jar" level="project" />
124124
<orderEntry type="library" scope="TEST" name="Gradle: org.objenesis:objenesis:2.6@jar" level="project" />
125125
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
126126
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
127-
<orderEntry type="library" name="Gradle: __local_aars__:C.\flutter\bin\cache\artifacts\engine\android-arm64\flutter.jar:unspecified@jar" level="project" />
128-
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
129-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
130-
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
131-
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
132-
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.2@aar" level="project" />
133-
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
134-
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.0.0@aar" level="project" />
135-
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
136-
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
137-
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.0.1@aar" level="project" />
138-
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
139-
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
140-
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
127+
<orderEntry type="library" name="Gradle: io.flutter:flutter_embedding_debug:1.0.0-2994f7e1e682039464cb25e31a78b86a3c59b695@jar" level="project" />
128+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common-java8:2.0.0@jar" level="project" />
129+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar" level="project" />
130+
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0@jar" level="project" />
131+
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" />
132+
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0@jar" level="project" />
133+
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
134+
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
135+
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
141136
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
142-
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
137+
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
138+
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
139+
<orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
140+
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
141+
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
143142
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
144-
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
145-
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
146-
<orderEntry type="library" name="Gradle: androidx.core:core:1.0.1@aar" level="project" />
147-
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
148-
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
149-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
150-
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
151-
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
152-
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
153-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
143+
<orderEntry type="library" name="Gradle: androidx.core:core:1.1.0@aar" level="project" />
144+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
145+
<orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
154146
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
155147
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
148+
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
149+
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
156150
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
151+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
157152
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
158-
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
159153
</component>
160154
</module>

‎android/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.enableR8=true

‎android/local.properties‎

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

‎example/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
}
2323

2424
defaultConfig {
25-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
25+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2626
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
2727
applicationId "com.yourcompany.flutter_webview_plugin_example"
2828
minSdkVersion 16
@@ -44,7 +44,7 @@ flutter {
4444
dependencies {
4545
testImplementation 'junit:junit:4.12'
4646

47-
androidTestImplementation 'androidx.annotation:annotation:1.0.2'
47+
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
4848
androidTestImplementation 'androidx.test:runner:1.2.0'
4949
androidTestImplementation 'androidx.test:rules:1.2.0'
5050
}

‎example/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.3.2'
11+
classpath 'com.android.tools.build:gradle:3.5.3'
1212
}
1313
}
1414

‎example/android/gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
3-
android.enableJetifier=false
3+
android.enableJetifier=true
4+
android.enableR8=true

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

0 commit comments

Comments
 (0)