Skip to content

Commit c019c2e

Browse files
committed
Upgrade Android Gradle
1 parent 6374ab7 commit c019c2e

File tree

19 files changed

+331
-164
lines changed

19 files changed

+331
-164
lines changed

dr_libphonenumber/android/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:8.0.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
@@ -25,6 +25,7 @@ apply plugin: 'com.android.library'
2525
apply plugin: 'kotlin-android'
2626

2727
android {
28+
namespace "com.tech_creator.dr_libphonenumber.dr_libphonenumber"
2829
compileSdkVersion 30
2930

3031
sourceSets {
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.tech_creator.dr_libphonenumber.dr_libphonenumber">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
</manifest>

dr_libphonenumber/example/android/app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29+
namespace "com.tech_creator.dr_libphonenumber.dr_libphonenumber_example"
2930
compileSdkVersion 33
3031

3132
sourceSets {

dr_libphonenumber/example/android/app/src/debug/AndroidManifest.xml

+1-2
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.tech_creator.dr_libphonenumber.dr_libphonenumber_example">
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
-->

dr_libphonenumber/example/android/app/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.tech_creator.dr_libphonenumber.dr_libphonenumber_example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<application
43
android:label="dr_libphonenumber_example"
54
android:icon="@mipmap/ic_launcher">
65
<activity
6+
android:exported="true"
77
android:name=".MainActivity"
88
android:launchMode="singleTop"
99
android:theme="@style/LaunchTheme"

dr_libphonenumber/example/android/app/src/profile/AndroidManifest.xml

+1-2
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.tech_creator.dr_libphonenumber.dr_libphonenumber_example">
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
-->

dr_libphonenumber/example/android/build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.5.30'
2+
ext.kotlin_version = '1.6.21'
33
repositories {
44
google()
55
mavenCentral()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:8.0.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
@@ -19,11 +19,12 @@ allprojects {
1919
}
2020

2121
rootProject.buildDir = '../build'
22+
2223
subprojects {
2324
project.buildDir = "${rootProject.buildDir}/${project.name}"
2425
project.evaluationDependsOn(':app')
2526
}
2627

27-
task clean(type: Delete) {
28+
tasks.register("clean", Delete) {
2829
delete rootProject.buildDir
2930
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4+
android.defaults.buildfeatures.buildconfig=true
5+
android.nonTransitiveRClass=false
6+
android.nonFinalResIds=false

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

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

dr_libphonenumber/example/pubspec.lock

+29-53
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
# Generated by pub
22
# See https://dart.dev/tools/pub/glossary#lockfile
33
packages:
4-
archive:
5-
dependency: transitive
6-
description:
7-
name: archive
8-
sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb"
9-
url: "https://pub.dev"
10-
source: hosted
11-
version: "3.3.2"
124
async:
135
dependency: transitive
146
description:
157
name: async
16-
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
179
url: "https://pub.dev"
1810
source: hosted
19-
version: "2.10.0"
11+
version: "2.11.0"
2012
boolean_selector:
2113
dependency: transitive
2214
description:
@@ -29,10 +21,10 @@ packages:
2921
dependency: transitive
3022
description:
3123
name: characters
32-
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
24+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
3325
url: "https://pub.dev"
3426
source: hosted
35-
version: "1.2.1"
27+
version: "1.3.0"
3628
clock:
3729
dependency: transitive
3830
description:
@@ -45,18 +37,10 @@ packages:
4537
dependency: transitive
4638
description:
4739
name: collection
48-
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
40+
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
4941
url: "https://pub.dev"
5042
source: hosted
51-
version: "1.17.0"
52-
crypto:
53-
dependency: transitive
54-
description:
55-
name: crypto
56-
sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
57-
url: "https://pub.dev"
58-
source: hosted
59-
version: "3.0.2"
43+
version: "1.17.1"
6044
cupertino_icons:
6145
dependency: "direct main"
6246
description:
@@ -110,10 +94,10 @@ packages:
11094
dependency: transitive
11195
description:
11296
name: ffi
113-
sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
97+
sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
11498
url: "https://pub.dev"
11599
source: hosted
116-
version: "2.0.1"
100+
version: "2.0.2"
117101
file:
118102
dependency: transitive
119103
description:
@@ -136,10 +120,10 @@ packages:
136120
dependency: transitive
137121
description:
138122
name: flutter_lints
139-
sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
123+
sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
140124
url: "https://pub.dev"
141125
source: hosted
142-
version: "2.0.1"
126+
version: "2.0.2"
143127
flutter_test:
144128
dependency: "direct dev"
145129
description: flutter
@@ -164,26 +148,26 @@ packages:
164148
dependency: transitive
165149
description:
166150
name: js
167-
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
151+
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
168152
url: "https://pub.dev"
169153
source: hosted
170-
version: "0.6.5"
154+
version: "0.6.7"
171155
lints:
172156
dependency: transitive
173157
description:
174158
name: lints
175-
sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
159+
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
176160
url: "https://pub.dev"
177161
source: hosted
178-
version: "2.0.1"
162+
version: "2.1.1"
179163
matcher:
180164
dependency: transitive
181165
description:
182166
name: matcher
183-
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
167+
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
184168
url: "https://pub.dev"
185169
source: hosted
186-
version: "0.12.13"
170+
version: "0.12.15"
187171
material_color_utilities:
188172
dependency: transitive
189173
description:
@@ -196,10 +180,10 @@ packages:
196180
dependency: transitive
197181
description:
198182
name: meta
199-
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
183+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
200184
url: "https://pub.dev"
201185
source: hosted
202-
version: "1.8.0"
186+
version: "1.9.1"
203187
package_config:
204188
dependency: transitive
205189
description:
@@ -212,10 +196,10 @@ packages:
212196
dependency: transitive
213197
description:
214198
name: path
215-
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
199+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
216200
url: "https://pub.dev"
217201
source: hosted
218-
version: "1.8.2"
202+
version: "1.8.3"
219203
platform:
220204
dependency: transitive
221205
description:
@@ -228,10 +212,10 @@ packages:
228212
dependency: transitive
229213
description:
230214
name: plugin_platform_interface
231-
sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
215+
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
232216
url: "https://pub.dev"
233217
source: hosted
234-
version: "2.1.3"
218+
version: "2.1.4"
235219
process:
236220
dependency: transitive
237221
description:
@@ -314,18 +298,10 @@ packages:
314298
dependency: transitive
315299
description:
316300
name: test_api
317-
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
301+
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
318302
url: "https://pub.dev"
319303
source: hosted
320-
version: "0.4.16"
321-
typed_data:
322-
dependency: transitive
323-
description:
324-
name: typed_data
325-
sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
326-
url: "https://pub.dev"
327-
source: hosted
328-
version: "1.3.1"
304+
version: "0.5.1"
329305
vector_math:
330306
dependency: transitive
331307
description:
@@ -338,18 +314,18 @@ packages:
338314
dependency: transitive
339315
description:
340316
name: vm_service
341-
sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
317+
sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
342318
url: "https://pub.dev"
343319
source: hosted
344-
version: "9.4.0"
320+
version: "11.3.0"
345321
webdriver:
346322
dependency: transitive
347323
description:
348324
name: webdriver
349-
sha256: ef67178f0cc7e32c1494645b11639dd1335f1d18814aa8435113a92e9ef9d841
325+
sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
350326
url: "https://pub.dev"
351327
source: hosted
352-
version: "3.0.1"
328+
version: "3.0.2"
353329
sdks:
354-
dart: ">=2.18.0 <4.0.0"
330+
dart: ">=3.0.0 <4.0.0"
355331
flutter: ">=3.0.0"

0 commit comments

Comments
 (0)