Skip to content

Commit d0ac3a4

Browse files
committed
Upgrade AGP to 8.9.1 and migrate Android Namespace
Using Android Studio AGP Upgrade Assistant : - AGP 7.1.3 -> 8.9.1 - Gradle 7.4 -> 8.11.1 - New Gradle properties `android.nonTransitiveRClass=false`,`android.nonFinalResIds=false` - Remove namespace declaration from `android/app/src/{debug,main,profile}/AndroidManifest.xml` - Add `.idea` and `build` to `android/.gitignore`
1 parent 48aa20e commit d0ac3a4

8 files changed

Lines changed: 13 additions & 10 deletions

File tree

android/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ GeneratedPluginRegistrant.java
1010
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
1111
key.properties
1212
/build/.last_build_id
13+
14+
# Remove AGP temp files
15+
/.idea/
16+
/build/

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ android {
4949

5050
defaultConfig {
5151
multiDexEnabled true
52-
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
5352
applicationId "com.piwigo.piwigo_ng"
5453
minSdkVersion 21
5554
targetSdkVersion 34
@@ -71,6 +70,7 @@ android {
7170
signingConfig signingConfigs.release
7271
}
7372
}
73+
namespace 'com.remi.piwigo_ng'
7474
}
7575

7676
flutter {

android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.remi.piwigo_ng">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.remi.piwigo_ng">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

4-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
3+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
54
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
65
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" android:minSdkVersion="33"/>
76
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" android:minSdkVersion="33"/>

android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.remi.piwigo_ng">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
44
android.jetifier.ignorelist=bcprov-jdk15on
5+
android.nonTransitiveRClass=false
6+
android.nonFinalResIds=false

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-7.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.1.3" apply false
21+
id "com.android.application" version '8.9.1' apply false
2222
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2323
}
2424

0 commit comments

Comments
 (0)