Split toolchains for example vs plugin

.github/workflows/ci.yml

@@ -11,13 +11,14 @@ jobs:
     name: Flutter version ${{ matrix.flutter_version }} (Android)
     strategy:
       matrix:
-        flutter_version: ["3.29.2"]
+        flutter_version: ["3.29.2", "3.38.5"]
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         with:
-          java-version: "11.x"
+          distribution: "temurin"
+          java-version: "17"
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: ${{ matrix.flutter_version }}
@@ -60,12 +61,22 @@ jobs:
       - name: Run rollbar_flutter Pana checks
         working-directory: ./rollbar_flutter
         run: ../build_tools/run-pana ${{ matrix.flutter_version }}
+      - name: Use JDK 11 for plugin Gradle check
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "11"
       - name: Test rollbar_flutter Android plugin
         working-directory: ./rollbar_flutter/android
         run: |
           export FLUTTER_SDK=$(../../build_tools/find-flutter-sdk)
           echo $FLUTTER_SDK
           ./gradlew check
+      - name: Use JDK 17 for example build
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
       - name: Build rollbar_flutter Android example
         working-directory: ./rollbar_flutter/example/
         run: flutter build apk
@@ -87,7 +98,7 @@ jobs:
     name: Flutter version ${{ matrix.flutter_version }} (iOS)
     strategy:
       matrix:
-        flutter_version: ["3.29.2"]
+        flutter_version: ["3.29.2", "3.38.5"]
 
     steps:
       - uses: actions/checkout@v4

build_tools/SDK_VERSION

@@ -1 +1 @@
-3.38.4
+3.38.5

rollbar_flutter/CHANGELOG.md

@@ -3,7 +3,15 @@
 ## 1.5.2
 
 ### FIX
+
 - Add missing namespace to support AGP 7.0+.
+- Add jsr305 annotations to satisfy R8 for javax.annotation.Nullable.
+
+### BUILD
+
+- Update the Android example to AGP 8.11.1, Gradle 8.14.3, and SDK 35.
+- Keep the Android plugin build on AGP 7.1.2 and Gradle 7.4 for compatibility.
+- Remove Flutter 1.x test source set handling in the Android plugin.
 
 ## 1.5.1
 

rollbar_flutter/android/build.gradle

@@ -82,6 +82,7 @@ def flutterVersion = "1.0.0-${engineVersion}"
 dependencies {
     api 'com.rollbar:rollbar-java:1.7.8'
     api 'com.rollbar:rollbar-android:1.7.8@aar'
+    api 'com.google.code.findbugs:jsr305:3.0.2'
     compileOnly "io.flutter:flutter_embedding_debug:${flutterVersion}"
 
     testImplementation "io.flutter:flutter_embedding_debug:${flutterVersion}"
@@ -167,17 +168,7 @@ task spotbugsMain(type: com.github.spotbugs.snom.SpotBugsTask) {
     }
 }
 
-String flutterCompatVersion = Paths
-    .get(flutterRoot, "version")
-    .toFile()
-    .text
-    .trim()
-
-if (flutterCompatVersion.startsWith('1.')) {
-    android.sourceSets.test.java.srcDir file('src/testflutter1/java/')
-} else {
-    android.sourceSets.test.java.srcDir file('src/testflutter/java/')
-}
+android.sourceSets.test.java.srcDir file('src/testflutter/java/')
 
 afterEvaluate {
     if (project.tasks.getByName("check")) {

rollbar_flutter/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.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists