build(battery_plus)!: Target Java 17 on Android (#2727)

fluttercommunity · Mar 19, 2024 · ca2c35a · ca2c35a
1 parent aa826de
commit ca2c35a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/packages/battery_plus/battery_plus/android/build.gradle b/packages/battery_plus/battery_plus/android/build.gradle
@@ -29,12 +29,12 @@ android {
     namespace 'dev.fluttercommunity.plus.battery'
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = 17
     }
 
     defaultConfig {

diff --git a/packages/battery_plus/battery_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/battery_plus/battery_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/packages/battery_plus/battery_plus/example/android/app/build.gradle b/packages/battery_plus/battery_plus/example/android/app/build.gradle
@@ -31,12 +31,12 @@ android {
     namespace 'io.flutter.plugins.batteryexample.example'
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = 17
     }
 
     sourceSets {

diff --git a/packages/battery_plus/battery_plus/example/lib/main.dart b/packages/battery_plus/battery_plus/example/lib/main.dart
@@ -65,8 +65,13 @@ class _MyHomePageState extends State<MyHomePage> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
+            const Text(
+              'Current battery state:',
+              style: TextStyle(fontSize: 24),
+            ),
+            const SizedBox(height: 8),
             Text(
-              '$_batteryState',
+              '${_batteryState?.name}',
               style: const TextStyle(fontSize: 24),
             ),
             const SizedBox(height: 24),