Skip to content

Commit 81e9324

Browse files
Captured-HeartCaptured-Heart
authored
added namespace to match AGP >4.2 conditions (#17)
* added namespace to match AGP >4.2 conditions * upgraded to java 17 * upgraded to java 1.8 * gradle 1.8 * removed kotlin_version * remov ed kotlin * imitated another plugin >4.2 AGP * imitated another plugin >4.2 AGP..
1 parent 2d8ab9d commit 81e9324

4 files changed

Lines changed: 133 additions & 51 deletions

File tree

‎android/build.gradle‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ group 'com.fsconceicao.open_document'
33
version '1.0-SNAPSHOT'
44

55
buildscript {
6-
ext.kotlin_version = '1.7.10'
6+
// ext.kotlin_version = '1.7.10'
77
repositories {
88
google()
99
mavenCentral()
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.2.2'
14-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13+
// classpath 'com.android.tools.build:gradle:7.2.2'
14+
classpath 'com.android.tools.build:gradle:8.5.1'
15+
// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1516
}
1617
}
1718

@@ -23,22 +24,39 @@ rootProject.allprojects {
2324
}
2425

2526
apply plugin: 'com.android.library'
26-
apply plugin: 'kotlin-android'
27+
// apply plugin: 'kotlin-android'
2728

2829
android {
29-
compileSdkVersion 33
30-
31-
sourceSets {
32-
main.java.srcDirs += 'src/main/kotlin'
30+
// Conditional for compatibility with AGP <4.2.
31+
if (project.android.hasProperty("namespace")) {
32+
namespace 'com.fsconceicao.open_document'
3333
}
34+
compileSdk 33
35+
// compileSdkVersion 33
36+
37+
// sourceSets {
38+
// main.java.srcDirs += 'src/main/kotlin'
39+
// }
3440
defaultConfig {
35-
minSdkVersion 16
41+
minSdkVersion 19
3642
}
3743
lintOptions {
44+
checkAllWarnings true
45+
warningsAsErrors true
3846
disable 'InvalidPackage'
3947
}
4048
}
4149

4250
dependencies {
43-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
51+
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
52+
53+
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4454
}
55+
kotlinOptions {
56+
jvmTarget = "1.8"
57+
}
58+
59+
compileOptions {
60+
sourceCompatibility = JavaVersion.VERSION_1_8
61+
targetCompatibility = JavaVersion.VERSION_1_8
62+
}

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

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

‎example/pubspec.lock‎

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ packages:
4545
dependency: transitive
4646
description:
4747
name: collection
48-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
48+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "1.17.1"
51+
version: "1.18.0"
5252
convert:
5353
dependency: transitive
5454
description:
@@ -160,30 +160,54 @@ packages:
160160
url: "https://pub.dev"
161161
source: hosted
162162
version: "0.6.7"
163+
leak_tracker:
164+
dependency: transitive
165+
description:
166+
name: leak_tracker
167+
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
168+
url: "https://pub.dev"
169+
source: hosted
170+
version: "10.0.5"
171+
leak_tracker_flutter_testing:
172+
dependency: transitive
173+
description:
174+
name: leak_tracker_flutter_testing
175+
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
176+
url: "https://pub.dev"
177+
source: hosted
178+
version: "3.0.5"
179+
leak_tracker_testing:
180+
dependency: transitive
181+
description:
182+
name: leak_tracker_testing
183+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
184+
url: "https://pub.dev"
185+
source: hosted
186+
version: "3.0.1"
163187
matcher:
164188
dependency: transitive
165189
description:
166190
name: matcher
167-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
191+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
168192
url: "https://pub.dev"
169193
source: hosted
170-
version: "0.12.15"
194+
version: "0.12.16+1"
171195
material_color_utilities:
172196
dependency: transitive
173197
description:
174198
name: material_color_utilities
175-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
199+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
176200
url: "https://pub.dev"
177201
source: hosted
178-
version: "0.2.0"
202+
version: "0.11.1"
179203
meta:
180204
dependency: transitive
181205
description:
182206
name: meta
183-
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
207+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
184208
url: "https://pub.dev"
185209
source: hosted
186-
version: "1.9.1"
210+
version: "1.15.0"
187211
mime:
188212
dependency: transitive
189213
description:
@@ -203,10 +227,10 @@ packages:
203227
dependency: transitive
204228
description:
205229
name: path
206-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
230+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
207231
url: "https://pub.dev"
208232
source: hosted
209-
version: "1.8.3"
233+
version: "1.9.0"
210234
path_provider:
211235
dependency: transitive
212236
description:
@@ -352,26 +376,26 @@ packages:
352376
dependency: transitive
353377
description:
354378
name: source_span
355-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
379+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
356380
url: "https://pub.dev"
357381
source: hosted
358-
version: "1.9.1"
382+
version: "1.10.0"
359383
stack_trace:
360384
dependency: transitive
361385
description:
362386
name: stack_trace
363-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
387+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
364388
url: "https://pub.dev"
365389
source: hosted
366-
version: "1.11.0"
390+
version: "1.11.1"
367391
stream_channel:
368392
dependency: transitive
369393
description:
370394
name: stream_channel
371-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
395+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
372396
url: "https://pub.dev"
373397
source: hosted
374-
version: "2.1.1"
398+
version: "2.1.2"
375399
string_scanner:
376400
dependency: transitive
377401
description:
@@ -392,10 +416,10 @@ packages:
392416
dependency: transitive
393417
description:
394418
name: test_api
395-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
419+
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
396420
url: "https://pub.dev"
397421
source: hosted
398-
version: "0.5.1"
422+
version: "0.7.2"
399423
typed_data:
400424
dependency: transitive
401425
description:
@@ -452,6 +476,14 @@ packages:
452476
url: "https://pub.dev"
453477
source: hosted
454478
version: "2.1.4"
479+
vm_service:
480+
dependency: transitive
481+
description:
482+
name: vm_service
483+
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
484+
url: "https://pub.dev"
485+
source: hosted
486+
version: "14.2.5"
455487
win32:
456488
dependency: transitive
457489
description:
@@ -469,5 +501,5 @@ packages:
469501
source: hosted
470502
version: "1.0.0"
471503
sdks:
472-
dart: ">=3.0.0-0 <4.0.0"
473-
flutter: ">=3.7.0"
504+
dart: ">=3.3.0 <4.0.0"
505+
flutter: ">=3.18.0-18.0.pre.54"

‎pubspec.lock‎

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ packages:
7777
dependency: transitive
7878
description:
7979
name: collection
80-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
80+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
8181
url: "https://pub.dev"
8282
source: hosted
83-
version: "1.17.1"
83+
version: "1.18.0"
8484
convert:
8585
dependency: transitive
8686
description:
@@ -200,6 +200,30 @@ packages:
200200
url: "https://pub.dev"
201201
source: hosted
202202
version: "0.6.7"
203+
leak_tracker:
204+
dependency: transitive
205+
description:
206+
name: leak_tracker
207+
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
208+
url: "https://pub.dev"
209+
source: hosted
210+
version: "10.0.5"
211+
leak_tracker_flutter_testing:
212+
dependency: transitive
213+
description:
214+
name: leak_tracker_flutter_testing
215+
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
216+
url: "https://pub.dev"
217+
source: hosted
218+
version: "3.0.5"
219+
leak_tracker_testing:
220+
dependency: transitive
221+
description:
222+
name: leak_tracker_testing
223+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
224+
url: "https://pub.dev"
225+
source: hosted
226+
version: "3.0.1"
203227
logging:
204228
dependency: transitive
205229
description:
@@ -220,26 +244,26 @@ packages:
220244
dependency: transitive
221245
description:
222246
name: matcher
223-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
247+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
224248
url: "https://pub.dev"
225249
source: hosted
226-
version: "0.12.15"
250+
version: "0.12.16+1"
227251
material_color_utilities:
228252
dependency: transitive
229253
description:
230254
name: material_color_utilities
231-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
255+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
232256
url: "https://pub.dev"
233257
source: hosted
234-
version: "0.2.0"
258+
version: "0.11.1"
235259
meta:
236260
dependency: transitive
237261
description:
238262
name: meta
239-
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
263+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
240264
url: "https://pub.dev"
241265
source: hosted
242-
version: "1.9.1"
266+
version: "1.15.0"
243267
mime:
244268
dependency: transitive
245269
description:
@@ -260,10 +284,10 @@ packages:
260284
dependency: transitive
261285
description:
262286
name: path
263-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
287+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
264288
url: "https://pub.dev"
265289
source: hosted
266-
version: "1.8.3"
290+
version: "1.9.0"
267291
path_provider:
268292
dependency: transitive
269293
description:
@@ -377,26 +401,26 @@ packages:
377401
dependency: transitive
378402
description:
379403
name: source_span
380-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
404+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
381405
url: "https://pub.dev"
382406
source: hosted
383-
version: "1.9.1"
407+
version: "1.10.0"
384408
stack_trace:
385409
dependency: transitive
386410
description:
387411
name: stack_trace
388-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
412+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
389413
url: "https://pub.dev"
390414
source: hosted
391-
version: "1.11.0"
415+
version: "1.11.1"
392416
stream_channel:
393417
dependency: transitive
394418
description:
395419
name: stream_channel
396-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
420+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
397421
url: "https://pub.dev"
398422
source: hosted
399-
version: "2.1.1"
423+
version: "2.1.2"
400424
string_scanner:
401425
dependency: transitive
402426
description:
@@ -417,10 +441,10 @@ packages:
417441
dependency: transitive
418442
description:
419443
name: test_api
420-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
444+
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
421445
url: "https://pub.dev"
422446
source: hosted
423-
version: "0.5.1"
447+
version: "0.7.2"
424448
typed_data:
425449
dependency: transitive
426450
description:
@@ -477,6 +501,14 @@ packages:
477501
url: "https://pub.dev"
478502
source: hosted
479503
version: "2.1.4"
504+
vm_service:
505+
dependency: transitive
506+
description:
507+
name: vm_service
508+
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
509+
url: "https://pub.dev"
510+
source: hosted
511+
version: "14.2.5"
480512
watcher:
481513
dependency: transitive
482514
description:
@@ -510,5 +542,5 @@ packages:
510542
source: hosted
511543
version: "3.1.2"
512544
sdks:
513-
dart: ">=3.0.0 <4.0.0"
514-
flutter: ">=3.7.0"
545+
dart: ">=3.3.0 <4.0.0"
546+
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)