Skip to content

Commit 69c8cd5

Browse files
committed
Update AGP to 8.7.1
1 parent 4bc9c5c commit 69c8cd5

11 files changed

+138
-81
lines changed

.metadata

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: "ba393198430278b6595976de84fe170f553cc728"
7+
revision: "17025dd88227cd9532c33fa78f5250d548d87e9a"
88
channel: "stable"
99

1010
project_type: app
@@ -13,26 +13,26 @@ project_type: app
1313
migration:
1414
platforms:
1515
- platform: root
16-
create_revision: ba393198430278b6595976de84fe170f553cc728
17-
base_revision: ba393198430278b6595976de84fe170f553cc728
16+
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
17+
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
1818
- platform: android
19-
create_revision: ba393198430278b6595976de84fe170f553cc728
20-
base_revision: ba393198430278b6595976de84fe170f553cc728
19+
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
20+
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
2121
- platform: ios
22-
create_revision: ba393198430278b6595976de84fe170f553cc728
23-
base_revision: ba393198430278b6595976de84fe170f553cc728
22+
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
23+
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
2424
- platform: linux
25-
create_revision: ba393198430278b6595976de84fe170f553cc728
26-
base_revision: ba393198430278b6595976de84fe170f553cc728
25+
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
26+
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
2727
- platform: macos
28-
create_revision: ba393198430278b6595976de84fe170f553cc728
29-
base_revision: ba393198430278b6595976de84fe170f553cc728
28+
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
29+
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
3030
- platform: web
31-
create_revision: ba393198430278b6595976de84fe170f553cc728
32-
base_revision: ba393198430278b6595976de84fe170f553cc728
31+
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
32+
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
3333
- platform: windows
34-
create_revision: ba393198430278b6595976de84fe170f553cc728
35-
base_revision: ba393198430278b6595976de84fe170f553cc728
34+
create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
35+
base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a
3636

3737
# User provided section
3838

.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "interactive"
3+
}

android/app/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ def _keyPassword = System.getenv("KEY_PASSWORD") ?: keystoreProperties.getProper
3737
def _storeFile = file(System.getenv("KEYSTORE") ?: keystoreProperties.getProperty("storeFile") ?: "keystore.jks")
3838
def _storePassword = System.getenv("KEYSTORE_PASSWORD") ?: keystoreProperties.getProperty("storePassword")
3939

40-
4140
android {
42-
ndkVersion "25.2.9519653"
41+
ndkVersion "27.0.12077973"
4342
compileSdkVersion 34
4443
namespace 'com.honjow.fehviewer'
4544

@@ -115,7 +114,6 @@ flutter {
115114
}
116115

117116
dependencies {
118-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20"
119117
implementation "androidx.startup:startup-runtime:1.2.0"
120118
implementation 'com.google.mlkit:barcode-scanning:17.3.0'
121119
}

android/build.gradle

+18-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,31 @@ allprojects {
66
}
77
}
88

9-
// 临时解决 error: resource android:attr/lStar not found
9+
// 临时解决依赖子项目的问题
1010
subprojects {
1111
afterEvaluate { project ->
1212
if (project.plugins.hasPlugin("com.android.application") ||
1313
project.plugins.hasPlugin("com.android.library")) {
14+
def javaVersion = JavaVersion.VERSION_17
1415
project.android {
16+
// 解决 error: resource android:attr/lStar not found
1517
compileSdkVersion 34
1618
buildToolsVersion "34.0.0"
19+
20+
// 解决 namespace 问题
21+
if (namespace == null) {
22+
namespace project.group
23+
}
24+
25+
compileOptions {
26+
sourceCompatibility javaVersion
27+
targetCompatibility javaVersion
28+
}
29+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
30+
kotlinOptions {
31+
jvmTarget = javaVersion.toString()
32+
}
33+
}
1734
}
1835
}
1936
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

android/settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '7.4.2' apply false
22-
id "org.jetbrains.kotlin.android" version "1.7.20" apply false
21+
id "com.android.application" version '8.7.1' apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
2323
id "com.google.gms.google-services" version "4.4.2" apply false
2424
id "com.google.firebase.crashlytics" version "2.9.9" apply false
2525
}

macos/Flutter/GeneratedPluginRegistrant.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import path_provider_foundation
1919
import sentry_flutter
2020
import share_plus
2121
import shared_preferences_foundation
22-
import sqflite
22+
import sqflite_darwin
2323
import url_launcher_macos
2424
import wakelock_plus
2525
import window_size

0 commit comments

Comments
 (0)