Skip to content

Commit 42f21fd

Browse files
author
Emmanuel Garcia
authored
Standardize how Java8 is set in gradle files (flutter#80600)
1 parent 0c1652f commit 42f21fd

File tree

42 files changed

+326
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+326
-29
lines changed

‎dev/benchmarks/complex_layout/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
minSdkVersion 16
2631
targetSdkVersion 30

‎dev/benchmarks/macrobenchmarks/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3131
android {
3232
compileSdkVersion 30
3333

34+
compileOptions {
35+
sourceCompatibility JavaVersion.VERSION_1_8
36+
targetCompatibility JavaVersion.VERSION_1_8
37+
}
38+
3439
defaultConfig {
3540
applicationId "com.example.macrobenchmarks"
3641
minSdkVersion 16

‎dev/benchmarks/microbenchmarks/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
minSdkVersion 16
2631
targetSdkVersion 30

‎dev/benchmarks/multiple_flutters/android/app/build.gradle

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,18 @@ android {
1212
self {
1313
}
1414
}
15+
1516
compileSdkVersion 30
1617

18+
compileOptions {
19+
sourceCompatibility JavaVersion.VERSION_1_8
20+
targetCompatibility JavaVersion.VERSION_1_8
21+
}
22+
23+
kotlinOptions {
24+
jvmTarget = '1.8'
25+
}
26+
1727
defaultConfig {
1828
applicationId "dev.flutter.multipleflutters"
1929
minSdkVersion 24
@@ -31,13 +41,6 @@ android {
3141
signingConfig debug.signingConfig
3242
}
3343
}
34-
compileOptions {
35-
sourceCompatibility JavaVersion.VERSION_1_8
36-
targetCompatibility JavaVersion.VERSION_1_8
37-
}
38-
kotlinOptions {
39-
jvmTarget = '1.8'
40-
}
4144
}
4245

4346
dependencies {

‎dev/benchmarks/platform_views_layout/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
minSdkVersion 16
2631
targetSdkVersion 30

‎dev/benchmarks/platform_views_layout_hybrid_composition/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
minSdkVersion 16
2631
targetSdkVersion 30

‎dev/benchmarks/test_apps/stocks/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3131
android {
3232
compileSdkVersion 30
3333

34+
compileOptions {
35+
sourceCompatibility JavaVersion.VERSION_1_8
36+
targetCompatibility JavaVersion.VERSION_1_8
37+
}
38+
3439
defaultConfig {
3540
applicationId "io.flutter.examples.stocks"
3641
minSdkVersion 16

‎dev/devicelab/bin/tasks/build_aar_module_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ Future<void> main() async {
262262
} catch (e) {
263263
return TaskResult.failure(e.toString());
264264
} finally {
265-
rmTree(tempDir);
265+
// rmTree(tempDir);
266266
}
267267
});
268268
}

‎dev/devicelab/bin/tasks/gradle_java8_compile_test.dart

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
// Copyright 2014 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import 'dart:io';
6+
7+
import 'package:flutter_devicelab/framework/apk_utils.dart';
8+
import 'package:flutter_devicelab/framework/framework.dart';
9+
import 'package:flutter_devicelab/framework/task_result.dart';
10+
import 'package:flutter_devicelab/framework/utils.dart';
11+
import 'package:path/path.dart' as path;
12+
13+
Future<void> main() async {
14+
await task(() async {
15+
try {
16+
await runPluginProjectTest((FlutterPluginProject pluginProject) async {
17+
18+
section('check main plugin file exists');
19+
final File pluginMainKotlinFile = File(
20+
path.join(
21+
pluginProject.rootPath,
22+
'android',
23+
'src',
24+
'main',
25+
'kotlin',
26+
path.join(
27+
'com',
28+
'example',
29+
'aaa',
30+
'AaaPlugin.kt',
31+
),
32+
),
33+
);
34+
35+
if (!pluginMainKotlinFile.existsSync()) {
36+
throw TaskResult.failure('Expected ${pluginMainKotlinFile.path} to exist, but it doesn\'t');
37+
}
38+
39+
section('add java 8 feature');
40+
pluginMainKotlinFile.writeAsStringSync(r'''
41+
package com.example.aaa
42+
43+
import android.util.Log
44+
import androidx.annotation.NonNull
45+
46+
import io.flutter.embedding.engine.plugins.FlutterPlugin
47+
import io.flutter.plugin.common.MethodCall
48+
import io.flutter.plugin.common.MethodChannel
49+
import io.flutter.plugin.common.MethodChannel.MethodCallHandler
50+
import io.flutter.plugin.common.MethodChannel.Result
51+
52+
import java.util.HashMap
53+
54+
/** AaaPlugin */
55+
class AaaPlugin: FlutterPlugin, MethodCallHandler {
56+
init {
57+
val map: HashMap<String, String> = HashMap<String, String>()
58+
// getOrDefault is a JAVA8 feature.
59+
Log.d("AaaPlugin", map.getOrDefault("foo", "baz"))
60+
}
61+
/// The MethodChannel that will the communication between Flutter and native Android
62+
///
63+
/// This local reference serves to register the plugin with the Flutter Engine and unregister it
64+
/// when the Flutter Engine is detached from the Activity
65+
private lateinit var channel : MethodChannel
66+
67+
override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
68+
channel = MethodChannel(flutterPluginBinding.binaryMessenger, "aaa")
69+
channel.setMethodCallHandler(this)
70+
}
71+
72+
override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
73+
if (call.method == "getPlatformVersion") {
74+
result.success("Android ${android.os.Build.VERSION.RELEASE}")
75+
} else {
76+
result.notImplemented()
77+
}
78+
}
79+
80+
override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
81+
channel.setMethodCallHandler(null)
82+
}
83+
}
84+
''');
85+
86+
section('Compiles');
87+
await inDirectory(pluginProject.exampleAndroidPath, () {
88+
return flutter(
89+
'build',
90+
options: <String>[
91+
'apk',
92+
'--debug',
93+
'--target-platform=android-arm'
94+
],
95+
);
96+
});
97+
98+
});
99+
return TaskResult.success(null);
100+
} on TaskResult catch (taskResult) {
101+
return taskResult;
102+
} catch (e) {
103+
return TaskResult.failure(e.toString());
104+
}
105+
});
106+
}

‎dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,19 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3232
android {
3333
compileSdkVersion 30
3434

35-
sourceSets {
36-
main.java.srcDirs += 'src/main/kotlin'
37-
}
38-
3935
compileOptions {
4036
sourceCompatibility JavaVersion.VERSION_1_8
4137
targetCompatibility JavaVersion.VERSION_1_8
4238
}
4339

40+
kotlinOptions {
41+
jvmTarget = '1.8'
42+
}
43+
44+
sourceSets {
45+
main.java.srcDirs += 'src/main/kotlin'
46+
}
47+
4448
defaultConfig {
4549
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4650
applicationId "com.example.abstract_method_smoke_test"
@@ -55,10 +59,6 @@ android {
5559
signingConfig signingConfigs.debug
5660
}
5761
}
58-
59-
kotlinOptions {
60-
jvmTarget = "1.8"
61-
}
6262
}
6363

6464
flutter {

‎dev/integration_tests/android_custom_host_app/SampleApp/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
compileSdkVersion 30
99

1010
compileOptions {
11-
sourceCompatibility 1.8
12-
targetCompatibility 1.8
11+
sourceCompatibility JavaVersion.VERSION_1_8
12+
targetCompatibility JavaVersion.VERSION_1_8
1313
}
1414

1515
defaultConfig {

‎dev/integration_tests/android_embedding_v2_smoke_test/android/app/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3232
android {
3333
compileSdkVersion 30
3434

35+
compileOptions {
36+
sourceCompatibility JavaVersion.VERSION_1_8
37+
targetCompatibility JavaVersion.VERSION_1_8
38+
}
39+
40+
kotlinOptions {
41+
jvmTarget = '1.8'
42+
}
43+
3544
sourceSets {
3645
main.java.srcDirs += 'src/main/kotlin'
3746
}

‎dev/integration_tests/android_host_app_v2_embedding/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
compileSdkVersion 30
99

1010
compileOptions {
11-
sourceCompatibility 1.8
12-
targetCompatibility 1.8
11+
sourceCompatibility JavaVersion.VERSION_1_8
12+
targetCompatibility JavaVersion.VERSION_1_8
1313
}
1414

1515
defaultConfig {

‎dev/integration_tests/android_semantics_testing/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
minSdkVersion 16
2631
targetSdkVersion 30

‎dev/integration_tests/android_views/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3131
android {
3232
compileSdkVersion 30
3333

34+
compileOptions {
35+
sourceCompatibility JavaVersion.VERSION_1_8
36+
targetCompatibility JavaVersion.VERSION_1_8
37+
}
38+
3439
defaultConfig {
3540
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3641
applicationId "io.flutter.integration.platformviews"

‎dev/integration_tests/channels/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
minSdkVersion 16
2631
targetSdkVersion 30

‎dev/integration_tests/external_ui/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
applicationId "io.flutter.externalui"
2631
minSdkVersion 16

‎dev/integration_tests/flavors/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
applicationId "com.yourcompany.flavors"
2631
minSdkVersion 16

‎dev/integration_tests/flutter_gallery/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
4242
android {
4343
compileSdkVersion 30
4444

45+
compileOptions {
46+
sourceCompatibility JavaVersion.VERSION_1_8
47+
targetCompatibility JavaVersion.VERSION_1_8
48+
}
49+
4550
defaultConfig {
4651
applicationId "io.flutter.demo.gallery"
4752
minSdkVersion 16

‎dev/integration_tests/gradle_deprecated_settings/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2121
android {
2222
compileSdkVersion 30
2323

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
28+
2429
defaultConfig {
2530
applicationId "com.yourcompany.flavors"
2631
minSdkVersion 21

‎dev/integration_tests/hybrid_android_views/android/app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
3131
android {
3232
compileSdkVersion 30
3333

34+
compileOptions {
35+
sourceCompatibility JavaVersion.VERSION_1_8
36+
targetCompatibility JavaVersion.VERSION_1_8
37+
}
38+
3439
defaultConfig {
3540
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3641
applicationId "io.flutter.integration.platformviews"

0 commit comments

Comments
 (0)