chore: Update Gradle to 8.2 and AGP to 8.2.0 (#360)

* Update Gradle to 8.2 and AGP to 8.2.0 * ci: setup JAVA 17 * wifi_iot(fix): example - unignore gradel-wrapper.properties --------- Co-authored-by: Harsh Bhikadia <[email protected]>
flutternetwork · Dec 19, 2023 · 581b67a · 581b67a
1 parent 71522f4
commit 581b67a
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 23 deletions.
diff --git a/.github/workflows/wifi_iot.yaml b/.github/workflows/wifi_iot.yaml
@@ -18,6 +18,11 @@ jobs:
     steps:
       - name: "Checkout repository"
         uses: actions/checkout@v2
+      - name: "Set up Java"
+        uses: actions/setup-java@v2
+        with:
+          distribution: "temurin"
+          java-version: 17
       - name: "Install Flutter"
         run: ./.github/workflows/scripts/install-flutter.sh stable
       - name: "Install Tools"

diff --git a/.github/workflows/wifi_scan.yaml b/.github/workflows/wifi_scan.yaml
@@ -18,6 +18,11 @@ jobs:
     steps:
       - name: "Checkout repository"
         uses: actions/checkout@v2
+      - name: "Set up Java"
+        uses: actions/setup-java@v2
+        with:
+          distribution: "temurin"
+          java-version: 17
       - name: "Install Flutter"
         run: ./.github/workflows/scripts/install-flutter.sh stable
       - name: "Install Tools"

diff --git a/packages/wifi_iot/.gitignore b/packages/wifi_iot/.gitignore
@@ -64,7 +64,6 @@ unlinked_spec.ds
 **/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
-**/android/gradle
 *.jks
 
 # iOS/XCode related
@@ -107,4 +106,4 @@ coverage/
 !/dev/ci/**/Gemfile.lock
 
 # FVM
-.fvm
+.fvm
diff --git a/packages/wifi_iot/android/build.gradle b/packages/wifi_iot/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.0'
     }
 }
 
@@ -22,6 +22,8 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'com.alternadom.wifiiot'
+
     compileSdkVersion 30
 
     defaultConfig {

diff --git a/packages/wifi_iot/android/gradle.properties b/packages/wifi_iot/android/gradle.properties
@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
+android.enableR8.fullMode=false
diff --git a/packages/wifi_iot/android/src/main/AndroidManifest.xml b/packages/wifi_iot/android/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.alternadom.wifiiot">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-feature android:name="android.hardware.wifi" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

diff --git a/packages/wifi_iot/example/android/app/build.gradle b/packages/wifi_iot/example/android/app/build.gradle
@@ -15,6 +15,8 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace 'com.alternadom.wifiiotexample'
+
     compileSdkVersion flutter.compileSdkVersion
 
     compileOptions {

diff --git a/packages/wifi_iot/example/android/app/src/main/AndroidManifest.xml b/packages/wifi_iot/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.alternadom.wifiiotexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
@@ -19,7 +18,8 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specify that the launch screen should continue being displayed -->
             <!-- until Flutter renders its first frame. -->
             <meta-data

diff --git a/packages/wifi_iot/example/android/build.gradle b/packages/wifi_iot/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.0'
     }
 }
 
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/packages/wifi_iot/example/android/gradle.properties b/packages/wifi_iot/example/android/gradle.properties
@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.enableR8=true
+android.enableR8.fullMode=false
diff --git a/packages/wifi_iot/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/wifi_iot/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/packages/wifi_scan/android/build.gradle b/packages/wifi_scan/android/build.gradle
@@ -2,14 +2,14 @@ group 'dev.flutternetwork.wifi.wifi_scan'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,6 +25,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace 'dev.flutternetwork.wifi.wifi_scan'
+
     compileSdkVersion 30
 
     compileOptions {

diff --git a/packages/wifi_scan/android/gradle.properties b/packages/wifi_scan/android/gradle.properties
@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true
+android.enableR8.fullMode=false
diff --git a/packages/wifi_scan/android/gradle/wrapper/gradle-wrapper.properties b/packages/wifi_scan/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/packages/wifi_scan/android/src/main/AndroidManifest.xml b/packages/wifi_scan/android/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="dev.flutternetwork.wifi.wifi_scan">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- required for: `WifiManager.getScanResult` -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <!-- required for: `WifiManager.startScan` -->

diff --git a/packages/wifi_scan/example/android/app/build.gradle b/packages/wifi_scan/example/android/app/build.gradle
@@ -26,6 +26,8 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace 'dev.flutternetwork.wifi.wifi_scan_example'
+
     compileSdkVersion flutter.compileSdkVersion
 
     compileOptions {

diff --git a/packages/wifi_scan/example/android/app/src/main/AndroidManifest.xml b/packages/wifi_scan/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutternetwork.wifi.wifi_scan_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="wifi_scan_example"
         android:icon="@mipmap/ic_launcher">

diff --git a/packages/wifi_scan/example/android/build.gradle b/packages/wifi_scan/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.21'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/packages/wifi_scan/example/android/gradle.properties b/packages/wifi_scan/example/android/gradle.properties
@@ -1,3 +1,5 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.enableR8=true
+android.enableR8.fullMode=false
diff --git a/packages/wifi_scan/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/wifi_scan/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip