Visitar URL original
[Android] Add Java/AGP/Gradle incompatibility warning to `flutter create` by camsim99 · Pull Request #131444 · flutter/flutter · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
389288f
Add verify methods and initial warnings
camsim99 Jul 27, 2023
8069931
Get code to compile
camsim99 Jul 28, 2023
0a91a4d
Pair w/Reid
camsim99 Jul 31, 2023
45b324e
Add wip from last week
camsim99 Aug 8, 2023
f864c26
gradle_utils edit
camsim99 Aug 8, 2023
95e6f70
Fix file paths
camsim99 Aug 8, 2023
e4cc801
Add compatible version ranges
camsim99 Aug 9, 2023
956124b
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 9, 2023
3b030b7
Update Java/Gradle tests
camsim99 Aug 9, 2023
4147210
Add tests for retrieving compatible Gradle/AGP versions
camsim99 Aug 9, 2023
f4c0753
Add create_tests and lint fixes
camsim99 Aug 14, 2023
4b62456
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 14, 2023
42f7ba5
Override Java in tool_tests_commands
camsim99 Aug 14, 2023
3420779
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 14, 2023
51706a1
Fix more Java versions
camsim99 Aug 14, 2023
1c1f07c
More fixes
camsim99 Aug 14, 2023
62f9ec4
Put fakes in create_usage_test.dart
camsim99 Aug 15, 2023
ce9158b
Change to fakejava
camsim99 Aug 15, 2023
5b97f1f
Merge branch 'master' into create_java_warning
camsim99 Aug 15, 2023
093d8e2
Self review
camsim99 Aug 15, 2023
6930330
Merge branch 'create_java_warning' of github.com:camsim99/flutter int…
camsim99 Aug 15, 2023
0c8b4e8
Fix header message and add patch versions to test
camsim99 Aug 16, 2023
606c86a
nits
camsim99 Aug 16, 2023
bba16b5
Add check for files and fix message formatting
camsim99 Aug 16, 2023
4598087
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 16, 2023
ea0ad42
nits
camsim99 Aug 16, 2023
bc1eeb4
correct messagse
camsim99 Aug 16, 2023
f4fd1de
Merge branch 'master' into create_java_warning
camsim99 Aug 16, 2023
a5998d1
Update packages/flutter_tools/lib/src/android/gradle_utils.dart
camsim99 Aug 22, 2023
e320678
Update packages/flutter_tools/lib/src/android/gradle_utils.dart
camsim99 Aug 22, 2023
bdeba7a
Update packages/flutter_tools/lib/src/commands/create.dart
camsim99 Aug 22, 2023
9bb0f6e
Update packages/flutter_tools/test/general.shard/android/gradle_utils…
camsim99 Aug 22, 2023
02f29d7
Update packages/flutter_tools/test/general.shard/android/gradle_utils…
camsim99 Aug 22, 2023
d8e3549
Update packages/flutter_tools/test/general.shard/android/gradle_utils…
camsim99 Aug 22, 2023
4a8c468
Update packages/flutter_tools/test/general.shard/android/gradle_utils…
camsim99 Aug 22, 2023
3580e66
Address review pt1
camsim99 Aug 22, 2023
74ce356
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 22, 2023
b9e4518
Fix gradle utils tests
camsim99 Aug 22, 2023
246942c
Fix analyze, add documentation
camsim99 Aug 23, 2023
f64886c
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 23, 2023
7a26d40
Add refs to readme
camsim99 Aug 23, 2023
ee6e4d1
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 23, 2023
39a2343
Correct readme
camsim99 Aug 23, 2023
a595dda
Change name
camsim99 Aug 24, 2023
6dff67d
Add checks for module
camsim99 Aug 28, 2023
b97a3a8
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Aug 28, 2023
fd75c2f
Fix inclusiveMax issue
camsim99 Aug 28, 2023
0ad6404
Merge branch 'master' into create_java_warning
camsim99 Aug 28, 2023
defb95b
Merge branch 'master' into create_java_warning
camsim99 Aug 29, 2023
21eb4b9
Update packages/flutter_tools/lib/src/android/gradle_utils.dart
camsim99 Aug 30, 2023
6a34dca
Update packages/flutter_tools/lib/src/android/README.md
camsim99 Aug 30, 2023
6c7e807
Update packages/flutter_tools/lib/src/android/gradle_utils.dart
camsim99 Aug 30, 2023
f6e1d10
Update packages/flutter_tools/lib/src/android/README.md
camsim99 Aug 30, 2023
e6ee3de
Update packages/flutter_tools/lib/src/android/README.md
camsim99 Aug 30, 2023
3ef6e63
Address gray nits
camsim99 Aug 30, 2023
bced8f1
Update packages/flutter_tools/lib/src/android/README.md
camsim99 Aug 30, 2023
2aa9d28
More nits
camsim99 Aug 30, 2023
703114b
Merge branch 'create_java_warning' of github.com:camsim99/flutter int…
camsim99 Aug 30, 2023
fb44759
Finish addressing gray's PR
camsim99 Aug 31, 2023
ebfae2f
Merge remote-tracking branch 'upstream/master' into create_java_warning
camsim99 Sep 14, 2023
ecdf8ec
Start addressing review
camsim99 Sep 14, 2023
f5404cd
Add todo before lannding
camsim99 Sep 14, 2023
5b2327a
Delete note that
camsim99 Sep 14, 2023
4408fd1
Fix test failures
camsim99 Sep 18, 2023
4465827
Merge remote-tracking branch 'upstream/main' into create_java_warning
camsim99 Sep 18, 2023
73a41e8
Update todos
camsim99 Sep 18, 2023
00b5fdc
Fix test logger calls
camsim99 Sep 18, 2023
b8361e1
Don't show java/gradle warning for plugin, pluginffi
camsim99 Sep 18, 2023
8f78253
Remove note that usages
camsim99 Sep 18, 2023
8908981
Nits and final test fixes
camsim99 Sep 19, 2023
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
Prev Previous commit
Next Next commit
Get code to compile
  • Loading branch information
camsim99 committed Jul 28, 2023
commit 80699316fe729da3a99775be15d7a7d710502cbb
31 changes: 17 additions & 14 deletions packages/flutter_tools/lib/src/android/gradle_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -588,12 +588,11 @@ bool validateJavaGradle(Logger logger,
//TODO(camsim99): Add doc
bool validateJavaAgp(Logger logger,
{required String? javaV, required String? agpV}) {
const String oldestSupportedJavaVersion = '1.8'; //TODO(camsim99): make this outside constant to reduce redundancy
const String oldestDocumentedJavaAgpCompatibility = '4.2';

if (javaV == null || agpV == null) {
logger.printTrace(
'Java version or AGP version unknown ($javaV, $gradleV).');
'Java version or AGP version unknown ($javaV, $agpV).');
return false;
}

Expand All @@ -606,27 +605,27 @@ bool validateJavaAgp(Logger logger,
// Begin known Java <-> AGP evaluation.
final List<JavaAgpCompat> compatList = <JavaAgpCompat>[
JavaAgpCompat(
javaMin: 17,
javaDefault: 17,
agpMin: 8.0,
javaMin: '17',
javaDefault: '17',
agpMin: '8.0',
agpMax: maxKnownAgpVersion,
),
JavaAgpCompat(
javaMin: 11,
javaDefault: 11,
agpMin: 7.0,
agpMax: 7.4,
javaMin: '11',
javaDefault: '11',
agpMin: '7.0',
agpMax: '7.4',
),
JavaAgpCompat(
javaMin: 7,
javaDefault: 8,
agpMin: 4.2,
agpMax: 4.2,
javaMin: '7',
javaDefault: '8',
agpMin: '4.2',
agpMax: '4.2',
),
];

for (final JavaAgpCompat data in compatList) {
if (javaV >= data.javaMin) {
if (isWithinVersionRange(javaV, min: data.javaMin, max: '20')) {//TODO(camsim99): make isWithinVersionRange have optional max
return isWithinVersionRange(agpV, min: data.agpMin, max: data.agpMax);
}
}
Expand Down Expand Up @@ -779,6 +778,10 @@ class JavaAgpCompat {
required this.agpMin,
required this.agpMax,
});
final String javaMin;
final String javaDefault;
final String agpMin;
final String agpMax;
}

class GradleForAgp {
Expand Down
4 changes: 2 additions & 2 deletions packages/flutter_tools/lib/src/commands/create.dart
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,8 @@ Your $application code is in $relativeAppMain.
}

if(includeAndroid && globals.java?.version != null){
_printWarningIncompatibleJavaGradleVersions(javaVersion: globals.java?.version, templateGradleVersion: templateContext.gradleVersion);
_printWarningIncompatibleJavaAgpVersions(javaVersion: globals.java?.version, templateAgpVersion: templateContext.agpVersion);
_printWarningIncompatibleJavaGradleVersions(javaVersion: globals.java?.version as String, templateGradleVersion: templateContext['gradleVersion'] as String, projectType: template);
_printWarningIncompatibleJavaAgpVersions(javaVersion: globals.java?.version as String, templateAgpVersion: templateContext['agpVersion'] as String, projectType: template);
}

return FlutterCommandResult.success();
Expand Down