[multiple] Java 8 target for all plugins with -Werror compiler arg (#…

…3216)
flutter · Sep 15, 2021 · bb3ebb2 · bb3ebb2
1 parent edc899e
commit bb3ebb2
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 28 deletions.
diff --git a/packages/android_alarm_manager/android/build.gradle b/packages/android_alarm_manager/android/build.gradle
@@ -28,10 +28,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -54,6 +50,10 @@ android {
             }
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Remove references to the V1 Android embedding.
 * Updated Android lint settings.
+* Specify Java 8 for Android build.
 
 ## 2.0.2
 

diff --git a/packages/android_intent/android/build.gradle b/packages/android_intent/android/build.gradle
@@ -37,8 +37,10 @@ android {
         disable 'InvalidPackage'
         disable 'GradleDependency'
     }
-
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true

diff --git a/packages/camera/camera/android/build.gradle b/packages/camera/camera/android/build.gradle
@@ -39,8 +39,8 @@ android {
         baseline file("lint-baseline.xml")
     }
     compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
 

diff --git a/packages/connectivity/connectivity/CHANGELOG.md b/packages/connectivity/connectivity/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Remove references to the Android V1 embedding.
 * Updated Android lint settings.
+* Specify Java 8 for Android build.
 
 ## 3.0.6
 

diff --git a/packages/connectivity/connectivity/android/build.gradle b/packages/connectivity/connectivity/android/build.gradle
@@ -50,4 +50,8 @@ android {
             }
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
diff --git a/packages/path_provider/path_provider/CHANGELOG.md b/packages/path_provider/path_provider/CHANGELOG.md
@@ -1,6 +1,7 @@
-## NEXT
+## 2.0.4
 
 * Updated Android lint settings.
+* Specify Java 8 for Android build.
 
 ## 2.0.3
 

diff --git a/packages/path_provider/path_provider/android/build.gradle b/packages/path_provider/path_provider/android/build.gradle
@@ -32,11 +32,9 @@ android {
         disable 'InvalidPackage'
         disable 'GradleDependency'
     }
-    android {
-        compileOptions {
-            sourceCompatibility 1.8
-            targetCompatibility 1.8
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
 

diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml
@@ -2,7 +2,7 @@ name: path_provider
 description: Flutter plugin for getting commonly used locations on host platform file systems, such as the temp and app data directories.
 repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.0.3
+version: 2.0.4
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

diff --git a/packages/video_player/video_player/CHANGELOG.md b/packages/video_player/video_player/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.2.1
+
+* Specify Java 8 for Android build.
+
 ## 2.2.0
 
 * Add `contentUri` based VideoPlayerController.

diff --git a/packages/video_player/video_player/android/build.gradle b/packages/video_player/video_player/android/build.gradle
@@ -37,11 +37,9 @@ android {
         disable 'InvalidPackage'
         disable 'GradleDependency'
     }
-    android {
-        compileOptions {
-            sourceCompatibility 1.8
-            targetCompatibility 1.8
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     dependencies {

diff --git a/packages/video_player/video_player/example/android/app/build.gradle b/packages/video_player/video_player/example/android/app/build.gradle
@@ -30,6 +30,10 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         applicationId "io.flutter.plugins.videoplayerexample"
@@ -40,13 +44,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    android {
-        compileOptions {
-            sourceCompatibility 1.8
-            targetCompatibility 1.8
-        }
-    }
-
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.

diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for displaying inline video with other Flutter
   widgets on Android, iOS, and web.
 repository: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.2.0
+version: 2.2.1
 
 environment:
   sdk: ">=2.12.0 <3.0.0"