Merge pull request #450 from oddbit/copilot/modernize-android-toolchain-ci

Modernize Android toolchain to AGP 8.5.2, Gradle 8.7, Kotlin 1.9.24, Java 17

Author: DennisAlund

.github/workflows/pr_build_example.yml

@@ -0,0 +1,71 @@
+name: Build example app on PR
+
+on:
+  pull_request:
+
+jobs:
+  build_android_example:
+    name: Android example build (debug)
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    permissions:
+      contents: read
+    env:
+      CI: true
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "17"
+          cache: gradle
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          api-level: 34
+          build-tools: 34.0.0
+          cache: true
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          cache: true
+
+      - run: flutter --version
+
+      - name: Flutter pub get (root)
+        run: flutter pub get
+
+      - name: Flutter pub get (example)
+        working-directory: example
+        run: flutter pub get
+
+      - name: Flutter clean (example)
+        working-directory: example
+        run: flutter clean
+
+      - name: Build example APK (debug, verbose)
+        working-directory: example
+        run: flutter build apk --debug -v
+
+      - name: List Android outputs
+        working-directory: example
+        run: |
+          echo "Listing build/app/outputs:"
+          ls -R build/app/outputs || true
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: example-app-debug-apk
+          path: |
+            example/build/app/outputs/flutter-apk/app-debug.apk
+            example/build/app/outputs/apk/debug/*.apk
+            example/build/**/outputs/**/*.apk
+          if-no-files-found: warn

android/.gitignore

@@ -6,3 +6,6 @@
 .DS_Store
 /build
 /captures
+gradle-wrapper.jar
+gradlew
+gradlew.bat

android/build.gradle

@@ -2,14 +2,14 @@ group = "id.oddbit.flutter.facebook_app_events"
 version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = "1.8.22"
+    ext.kotlin_version = "1.9.24"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("com.android.tools.build:gradle:8.5.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
@@ -26,20 +26,16 @@ apply plugin: "kotlin-android"
 
 android {
     namespace "id.oddbit.flutter.facebook_app_events"
-    // Conditional for compatibility with AGP < 4.2
-    if (project.android.hasProperty("namespace")) {
-        namespace "id.oddbit.flutter.facebook_app_events"
-    }
 
     compileSdk = 34
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = "17"
     }
 
     sourceSets {
@@ -55,16 +51,7 @@ android {
     }
 
     dependencies {
-        // # READ THIS
-        // When updating the Facebook SDK. Please note these guidelines to avoid
-        // conflicts with other plugins that also rely on the FBSDK.
-        //
-        // - Only specify the major version of the SDK. 
-        // - Do **not** specify the `minor` or `patch` version.
-        //
-        // About the version syntax:
-        //  - https://github.com/oddbit/flutter_facebook_app_events/pull/189#discussion_r768267841
-        //  - https://docs.oracle.com/middleware/1212/core/MAVEN/maven_version.htm#MAVEN402
+        // Keep major-only range per repo guidelines.
         implementation("com.facebook.android:facebook-android-sdk:[18.0,19.0)")
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+# AGP 8.5.x pairs with Gradle 8.7
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip

example/android/app/build.gradle

@@ -11,19 +11,16 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = "17"
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "id.oddbit.flutter.facebook_app_events_example"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
@@ -41,8 +38,7 @@ android {
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
+            // Signing with the debug keys for sample reproducibility.
             signingConfig = signingConfigs.debug
         }
     }

example/android/build.gradle

@@ -7,12 +7,10 @@ buildscript {
     }
 
     dependencies {
-        // Updated Android Gradle Plugin to meet Flutter's minimum supported version.
-        // Was: 'com.android.tools.build:gradle:8.1.0'
-        classpath 'com.android.tools.build:gradle:8.1.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        // Modern Android Gradle Plugin
+        classpath 'com.android.tools.build:gradle:8.5.2'
+        // Modern Kotlin
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24"
     }
 }
 

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-# Use Gradle 8.3 which is compatible with Android Gradle Plugin 8.1.1
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+# AGP 8.5.x pairs with Gradle 8.7
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip