Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android project upgrade #364

Open
wants to merge 1 commit into
base: dev-2.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 89 additions & 101 deletions .dart_tool/package_config.json

Large diffs are not rendered by default.

124 changes: 61 additions & 63 deletions .packages
Original file line number Diff line number Diff line change
@@ -1,68 +1,66 @@
# This file is deprecated. Tools should instead consume
# `.dart_tools/package_config.json`.
# `.dart_tool/package_config.json`.
#
# For more info see: https://dart.dev/go/dot-packages-deprecation
#
# Generated by pub on 2021-05-25 11:48:37.742718.
_fe_analyzer_shared:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/_fe_analyzer_shared-19.0.0/lib/
analyzer:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/analyzer-1.3.0/lib/
args:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/args-2.0.0/lib/
async:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.5.0/lib/
boolean_selector:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-2.1.0/lib/
build:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/build-2.0.0/lib/
built_collection:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/built_collection-5.0.0/lib/
built_value:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/built_value-8.0.4/lib/
characters:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/characters-1.1.0/lib/
charcode:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.2.0/lib/
cli_util:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/cli_util-0.3.0/lib/
code_builder:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/code_builder-4.0.0/lib/
collection:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.15.0/lib/
convert:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-3.0.0/lib/
coverage:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/coverage-1.0.2/lib/
crypto:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-3.0.0/lib/
dart_style:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/dart_style-1.3.14/lib/
file:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/file-6.1.0/lib/
fixnum:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/fixnum-1.0.0/lib/
flutter:file:///D:/Workspace/android/flutter/packages/flutter/lib/
frontend_server_client:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/frontend_server_client-2.1.0/lib/
glob:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/glob-2.0.1/lib/
http_multi_server:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_multi_server-3.0.0/lib/
http_parser:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-4.0.0/lib/
io:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/io-1.0.0/lib/
js:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/js-0.6.3/lib/
logging:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/logging-1.0.0/lib/
matcher:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.10/lib/
meta:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.3.0/lib/
mime:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/mime-1.0.0/lib/
mockito:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/mockito-5.0.8/lib/
node_preamble:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/node_preamble-2.0.0/lib/
package_config:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_config-2.0.0/lib/
path:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.8.0/lib/
pedantic:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.11.0/lib/
platform:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform-3.0.0/lib/
pool:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/pool-1.5.0/lib/
pub_semver:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/pub_semver-2.0.0/lib/
shelf:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf-1.1.0/lib/
shelf_packages_handler:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf_packages_handler-3.0.0/lib/
shelf_static:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf_static-1.0.0/lib/
shelf_web_socket:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf_web_socket-1.0.1/lib/
sky_engine:file:///D:/Workspace/android/flutter/bin/cache/pkg/sky_engine/lib/
source_gen:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_gen-0.9.10+4/lib/
source_map_stack_trace:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_map_stack_trace-2.1.0/lib/
source_maps:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_maps-0.10.10/lib/
source_span:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.8.1/lib/
stack_trace:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.10.0/lib/
stream_channel:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.1.0/lib/
string_scanner:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.1.0/lib/
term_glyph:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.2.0/lib/
test:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/test-1.17.4/lib/
test_api:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.4.0/lib/
test_core:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_core-0.3.24/lib/
typed_data:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.3.0/lib/
vector_math:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.1.0/lib/
vm_service:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/vm_service-6.1.0+1/lib/
watcher:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/watcher-1.0.0/lib/
web_socket_channel:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/web_socket_channel-2.0.0/lib/
webkit_inspection_protocol:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/webkit_inspection_protocol-1.0.0/lib/
yaml:file:///D:/Workspace/android/flutter/.pub-cache/hosted/pub.flutter-io.cn/yaml-3.1.0/lib/
# Generated by pub on 2022-08-07 02:03:46.979276.
_fe_analyzer_shared:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/_fe_analyzer_shared-44.0.0/lib/
analyzer:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/analyzer-4.4.0/lib/
args:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/lib/
async:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/async-2.9.0/lib/
boolean_selector:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/
build:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/build-2.3.0/lib/
built_collection:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/built_collection-5.1.1/lib/
built_value:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/built_value-8.4.0/lib/
characters:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/lib/
code_builder:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/code_builder-4.2.0/lib/
collection:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/collection-1.16.0/lib/
convert:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/convert-3.0.2/lib/
coverage:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/coverage-1.5.0/lib/
crypto:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/crypto-3.0.2/lib/
dart_style:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/dart_style-2.2.3/lib/
file:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/file-6.1.2/lib/
fixnum:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/fixnum-1.0.1/lib/
flutter:file:///Users/jiankian/Applications/Developer/flutter/packages/flutter/lib/
frontend_server_client:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/frontend_server_client-2.1.3/lib/
glob:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/glob-2.1.0/lib/
http_multi_server:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/http_multi_server-3.2.1/lib/
http_parser:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/http_parser-4.0.1/lib/
io:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/io-1.0.3/lib/
js:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/js-0.6.4/lib/
logging:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/logging-1.0.2/lib/
matcher:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.12/lib/
material_color_utilities:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/material_color_utilities-0.1.4/lib/
meta:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/meta-1.7.0/lib/
mime:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/mime-1.0.2/lib/
mockito:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/mockito-5.3.0/lib/
node_preamble:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/node_preamble-2.0.1/lib/
package_config:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/package_config-2.1.0/lib/
path:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/path-1.8.2/lib/
platform:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/platform-3.1.0/lib/
pool:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/pool-1.5.1/lib/
pub_semver:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/pub_semver-2.1.1/lib/
shelf:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/shelf-1.3.2/lib/
shelf_packages_handler:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-3.0.1/lib/
shelf_static:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/shelf_static-1.1.1/lib/
shelf_web_socket:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-1.0.2/lib/
sky_engine:file:///Users/jiankian/Applications/Developer/flutter/bin/cache/pkg/sky_engine/lib/
source_gen:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/source_gen-1.2.2/lib/
source_map_stack_trace:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-2.1.0/lib/
source_maps:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.10/lib/
source_span:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/source_span-1.9.1/lib/
stack_trace:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0/lib/
stream_channel:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0/lib/
string_scanner:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.1/lib/
term_glyph:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.1/lib/
test:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/test-1.21.4/lib/
test_api:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/test_api-0.4.12/lib/
test_core:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/test_core-0.4.16/lib/
typed_data:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.1/lib/
vector_math:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.2/lib/
vm_service:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/vm_service-9.3.0/lib/
watcher:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/watcher-1.0.1/lib/
web_socket_channel:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-2.2.0/lib/
webkit_inspection_protocol:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/webkit_inspection_protocol-1.1.0/lib/
yaml:file:///Users/jiankian/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.1/lib/
jpush_flutter:lib/
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.2.2'
}
}

Expand All @@ -24,7 +24,7 @@ rootProject.allprojects {
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
compileSdkVersion 33

defaultConfig {
minSdkVersion 17
Expand Down
3 changes: 1 addition & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Jul 26 11:14:36 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
3 changes: 3 additions & 0 deletions android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
<action android:name="cn.jiguang.user.service.action" />
</intent-filter>
</service>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
</manifest>
2 changes: 1 addition & 1 deletion example/.flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"jmessage_flutter","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\jmessage_flutter-2.0.7\\\\","dependencies":[]},{"name":"jpush_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jpush-flutter-plugin\\\\","dependencies":[]}],"android":[{"name":"jmessage_flutter","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\jmessage_flutter-2.0.7\\\\","dependencies":[]},{"name":"jpush_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jpush-flutter-plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"jmessage_flutter","dependencies":[]},{"name":"jpush_flutter","dependencies":[]}],"date_created":"2021-05-25 15:47:27.235993","version":"2.2.0"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"jmessage_flutter","path":"/Users/jiankian/.pub-cache/hosted/pub.dartlang.org/jmessage_flutter-2.0.7/","native_build":true,"dependencies":[]},{"name":"jpush_flutter","path":"/Users/jiankian/AndroidStudioProjects/jpush-flutter-plugin/","native_build":true,"dependencies":[]}],"android":[{"name":"jmessage_flutter","path":"/Users/jiankian/.pub-cache/hosted/pub.dartlang.org/jmessage_flutter-2.0.7/","native_build":true,"dependencies":[]},{"name":"jpush_flutter","path":"/Users/jiankian/AndroidStudioProjects/jpush-flutter-plugin/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"jmessage_flutter","dependencies":[]},{"name":"jpush_flutter","dependencies":[]}],"date_created":"2022-08-07 02:21:27.802549","version":"3.0.5"}
8 changes: 4 additions & 4 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

android {
compileSdkVersion 28
compileSdkVersion 33
lintOptions {
disable 'InvalidPackage'
}
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).

// applicationId "com.jiguang.jpushexample"
applicationId "com.jiguang.jpushexample"

applicationId "com.shikk.testJpush" //JPush 上注册的包名.
// applicationId "com.shikk.testJpush" //JPush 上注册的包名.

minSdkVersion 17
targetSdkVersion 28
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down
8 changes: 8 additions & 0 deletions example/android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.jiguang.jpushexample">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>
5 changes: 3 additions & 2 deletions example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name="io.flutter.app.FlutterApplication"
android:name="${applicationName}"
android:label="jpush_example"
android:icon="@mipmap/ic_launcher">
<activity
Expand All @@ -22,7 +22,8 @@
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustResize"
android:exported="true">
<!-- This keeps the window background of the activity showing
until Flutter renders its first frame. It can be removed if
there is no splash screen (such as the default splash screen
Expand Down
8 changes: 8 additions & 0 deletions example/android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.jiguang.jpushexample">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.2.2'
}
}

Expand Down
3 changes: 2 additions & 1 deletion example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ org.gradle.jvmargs=-Xmx1536M
#systemProp.https.proxyHost=127.0.0.1
#systemProp.http.proxyPort=1086
android.enableR8=true
android.useAndroidX=true
android.useAndroidX=true
android.enableJetifier=true
6 changes: 3 additions & 3 deletions example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Aug 21 15:20:04 CST 2019
#Sun Aug 07 01:33:40 CST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME
18 changes: 7 additions & 11 deletions example/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
include ':app'

def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()

def plugins = new Properties()
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
if (pluginsFile.exists()) {
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
}
assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }

plugins.each { name, path ->
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
include ":$name"
project(":$name").projectDir = pluginDirectory
}
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
Loading