Release/v1.6.9 (#256)

Release: 1.6.9
Also updated to AGP 8 and target Android SDK 35.

Author: rileychh

android/app/build.gradle

@@ -36,23 +36,32 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     namespace = "club.ntut.npc.tat"
-    compileSdkVersion 34
-    ndkVersion "25.1.8937393"
+    compileSdk 35
+    ndkVersion = "25.1.8937393"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    lintOptions {
+    lint {
         disable 'InvalidPackage'
         checkReleaseBuilds false
         abortOnError false
     }
 
     defaultConfig {
         applicationId "club.ntut.npc.tat"
-        minSdkVersion 24
-        targetSdkVersion 34
+        minSdk 24
+        targetSdk 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -85,7 +94,7 @@ android {
         }
     }
 
-    flavorDimensions "default"
+    flavorDimensions = ["default"]
     productFlavors {
         beta {
             dimension "default"

android/app/proguard-rules.pro

@@ -7,6 +7,7 @@
 -keep class io.flutter.plugins.**  { *; }
 
 -dontwarn io.flutter.embedding.**
+-dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
 
 ## Gson rules
 # Gson uses generic type information stored in a class file when working with fields. Proguard

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
@@ -28,6 +28,38 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
+// AGP 8.x workarounds for plugins
+subprojects { subproject ->
+    subproject.plugins.withId('com.android.library') {
+        subproject.android {
+            compileSdk 35
+
+            if (namespace == null || namespace.isEmpty()) {
+                def manifest = subproject.file("src/main/AndroidManifest.xml")
+                if (manifest.exists()) {
+                    def xml = new groovy.xml.XmlSlurper().parse(manifest)
+                    namespace = xml.@package.toString()
+                }
+            }
+        }
+
+        // Force Java 11 after plugin evaluation
+        subproject.afterEvaluate {
+            subproject.android {
+                compileOptions {
+                    sourceCompatibility JavaVersion.VERSION_11
+                    targetCompatibility JavaVersion.VERSION_11
+                }
+            }
+        }
+    }
+    subproject.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = "11"
+        }
+    }
+}
+
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -3,5 +3,7 @@ android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
 
-# Reason: Recently, the Flutter team has received several reports from developers indicating they are experiencing app crashes on certain devices on Android 6.0.
-# android.bundle.enableUncompressedNativeLibs=false
+# AGP 8.x compatibility
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

lib/src/task/dialog_task.dart

@@ -1,7 +1,5 @@
-// ignore_for_file: import_of_legacy_library_into_null_safe
-
 import 'package:awesome_dialog/awesome_dialog.dart';
-import 'package:connectivity/connectivity.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter_app/src/r.dart';
 import 'package:flutter_app/ui/other/msg_dialog.dart';
 import 'package:flutter_app/ui/other/my_progress_dialog.dart';
@@ -39,7 +37,7 @@ class DialogTask<T> extends Task<T> {
   }
 
   Future<TaskStatus> onErrorParameter(MsgDialogParameter parameter) async {
-    final connectivityResult = await (Connectivity().checkConnectivity());
+    final connectivityResult = await Connectivity().checkConnectivity();
     if (connectivityResult == ConnectivityResult.none) {
       parameter = MsgDialogParameter(
         desc: R.current.networkError,

lib/src/task/task_flow.dart

@@ -1,6 +1,4 @@
-// ignore_for_file: import_of_legacy_library_into_null_safe
-
-import 'package:connectivity/connectivity.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter_app/debug/log/log.dart';
 import 'package:flutter_app/src/r.dart';
 import 'package:flutter_app/src/task/course/course_system_task.dart';
@@ -41,7 +39,7 @@ class TaskFlow {
   }
 
   Future<bool> start() async {
-    var connectivityResult = await (Connectivity().checkConnectivity());
+    final connectivityResult = await Connectivity().checkConnectivity();
     if (connectivityResult == ConnectivityResult.none) {
       MyToast.show(R.current.pleaseConnectToNetwork);
       return false;

lib/src/util/mx_player_util.dart

@@ -2,7 +2,7 @@
 // @dart=2.10
 import 'dart:io';
 
-import 'package:android_intent/android_intent.dart';
+import 'package:android_intent_plus/android_intent.dart';
 import 'package:flutter_app/src/r.dart';
 import 'package:flutter_app/ui/other/my_toast.dart';
 import 'package:flutter_app/ui/other/route_utils.dart';

lib/src/version/update/app_update.dart

@@ -9,7 +9,7 @@ import 'package:flutter_app/src/r.dart';
 import 'package:flutter_app/src/util/remote_config_util.dart';
 import 'package:flutter_app/ui/other/my_toast.dart';
 import 'package:get/get.dart';
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:sprintf/sprintf.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:version/version.dart';

lib/ui/pages/other/page/setting_page.dart

@@ -2,7 +2,7 @@
 
 import 'dart:io';
 
-import 'package:connectivity/connectivity.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app/src/config/app_config.dart';
 import 'package:flutter_app/src/config/app_themes.dart';